Merge remote-tracking branch 'origin/development' into development

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('"\'')

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