Use strict=False for same config parsing on py2 and py3

Author: mnaberez

supervisor/options.py

@@ -1722,6 +1722,12 @@ def __init__(self, *args, **kwargs):
         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.
+        if not PY2:
+            kwargs['strict'] = False
+
         ConfigParser.RawConfigParser.__init__(self, *args, **kwargs)
 
         self.section_to_file = {}

supervisor/tests/test_options.py

@@ -316,6 +316,19 @@ 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):
+        text = lstrip("""
+        [supervisorctl]
+        serverurl=http://localhost:9001 ;duplicate
+
+        [supervisorctl]
+        serverurl=http://localhost:9001 ;duplicate
+        """)
+        instance = self._makeOne()
+        instance.configfile = StringIO(text)
+        instance.realize(args=[])
+        # should not raise configparser.DuplicateSectionError on py3
+
     def test_options_with_environment_expansions(self):
         s = lstrip("""[supervisorctl]
         serverurl=http://localhost:%(ENV_SERVER_PORT)s
@@ -690,6 +703,21 @@ 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):
+        text = lstrip("""
+        [supervisord]
+
+        [program:duplicate]
+        command=/bin/cat
+
+        [program:duplicate]
+        command=/bin/cat
+        """)
+        instance = self._makeOne()
+        instance.configfile = StringIO(text)
+        instance.realize(args=[])
+        # should not raise configparser.DuplicateSectionError on py3
+
     def test_reload(self):
         text = lstrip("""\
         [supervisord]