Refactor to allow strict to still be set in kwargs

Author: mnaberez

supervisor/options.py

@@ -1716,17 +1716,15 @@ class UnhosedConfigParser(ConfigParser.RawConfigParser):
     mysection = 'supervisord'
 
     def __init__(self, *args, **kwargs):
-        # inline_comment_prefixes was added in Python 3 but its default makes
-        # RawConfigParser behave differently than it did on Python 2.  This
-        # makes it behave the same by default on Python 2 and 3.
-        if (not PY2) and ('inline_comment_prefixes' not in kwargs):
-            kwargs['inline_comment_prefixes'] = (';', '#')
-
-        # strict was added in Python 3 but its default makes RawConfigParser
-        # behave differently than it did on Python 2.  This makes it behave
-        # the same by default on Python 2 and 3.
+        # inline_comment_prefixes and strict were added in Python 3 but their
+        # defaults make RawConfigParser behave differently than it did on
+        # Python 2.  We make it work like 2 by default for backwards compat.
         if not PY2:
-            kwargs['strict'] = False
+            if 'inline_comment_prefixes' not in kwargs:
+                kwargs['inline_comment_prefixes'] = (';', '#')
+
+            if 'strict' not in kwargs:
+                kwargs['strict'] = False
 
         ConfigParser.RawConfigParser.__init__(self, *args, **kwargs)
 

supervisor/tests/test_options.py

@@ -316,7 +316,7 @@ def test_options_ignores_inline_comments(self):
         options = instance.configroot.supervisorctl
         self.assertEqual(options.serverurl, 'http://localhost:9001')
 
-    def test_options_parsers_as_nonstrict_for_py2_py3_compat(self):
+    def test_options_parses_as_nonstrict_for_py2_py3_compat(self):
         text = lstrip("""
         [supervisorctl]
         serverurl=http://localhost:9001 ;duplicate
@@ -703,7 +703,7 @@ def test_options_ignores_inline_comments(self):
         options = instance.configroot.supervisord
         self.assertEqual(options.identifier, 'foo')
 
-    def test_options_parsers_as_nonstrict_for_py2_py3_compat(self):
+    def test_options_parses_as_nonstrict_for_py2_py3_compat(self):
         text = lstrip("""
         [supervisord]