diff options
| author | Halali <[email protected]> | 2019-11-27 23:35:59 +0100 |
|---|---|---|
| committer | Halali <[email protected]> | 2019-11-27 23:35:59 +0100 |
| commit | 9fbec327c41f74a6e74595fc5f4eb4226b0a4e1f (patch) | |
| tree | 006d4e5c76dccde4d00edd79458385c97636f70c | |
| parent | f1596ef7ba32127e09f9d22fee738de7d414ec76 (diff) | |
| parent | 8b10b0e5e44afeabc09bcf0c14ba306e8ebc3f1b (diff) | |
| download | bazarr-9fbec327c41f74a6e74595fc5f4eb4226b0a4e1f.tar.gz bazarr-9fbec327c41f74a6e74595fc5f4eb4226b0a4e1f.zip | |
Merge remote-tracking branch 'origin/development' into development
| -rw-r--r-- | libs/simpleconfigparser/__init__.py | 4 | ||||
| -rw-r--r-- | libs/version.txt | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libs/simpleconfigparser/__init__.py b/libs/simpleconfigparser/__init__.py index 959ebda6a..9cce999b9 100644 --- a/libs/simpleconfigparser/__init__.py +++ b/libs/simpleconfigparser/__init__.py @@ -24,7 +24,7 @@ THE SOFTWARE. """ try: - from backports.configparser2 import ConfigParser as configparser, NoOptionError, NoSectionError + from configparser import ConfigParser as configparser, NoOptionError, NoSectionError except ImportError: from ConfigParser import SafeConfigParser as configparser, NoOptionError, NoSectionError @@ -123,7 +123,7 @@ class simpleconfigparser(configparser): except NoSectionError: return None - def get(self, section, option, raw=False, vars=None): + def get(self, section, option, raw=False, vars=None, fallback=None): try: # Strip out quotes from the edges return configparser.get(self, section, option, raw=raw, vars=vars).strip('"\'') diff --git a/libs/version.txt b/libs/version.txt index ce620b1ef..7916cd383 100644 --- a/libs/version.txt +++ b/libs/version.txt @@ -22,7 +22,7 @@ pytz=2018.4 rarfile=3.0 requests=2.18.4 six=1.11.0 -SimpleConfigParser=0.1.0 +SimpleConfigParser=0.1.0 <-- modified version: do not update!!! stevedore=1.28.0 subliminal=2.1.0dev tzlocal=1.5.1 |