[Python-checkins] cpython (merge 3.3 -> default): #16925: merge with 3.3.

Fri Jan 11 05:32:27 CET 2013

http://hg.python.org/cpython/rev/680a855ec91e
changeset: 81386:680a855ec91e
parent: 81384:02180599a99f
parent: 81385:7dbdd7204d0a
user: Ezio Melotti <ezio.melotti at gmail.com>
date: Fri Jan 11 06:32:06 2013 +0200
summary:
 #16925: merge with 3.3.
files:
 Lib/test/test_configparser.py | 48 ++++++----------------
 Misc/NEWS | 3 +
 2 files changed, 16 insertions(+), 35 deletions(-)

diff --git a/Lib/test/test_configparser.py b/Lib/test/test_configparser.py
--- a/Lib/test/test_configparser.py
+++ b/Lib/test/test_configparser.py
@@ -32,7 +32,7 @@
 __iter__ = iterkeys
 
 
-class CfgParserTestCaseClass(unittest.TestCase):
+class CfgParserTestCaseClass:
 allow_no_value = False
 delimiters = ('=', ':')
 comment_prefixes = (';', '#')
@@ -830,12 +830,12 @@
 self.assertEqual(cf.sections(), ['section1', 'section2', 'section3'])
 
 
-class StrictTestCase(BasicTestCase):
+class StrictTestCase(BasicTestCase, unittest.TestCase):
 config_class = configparser.RawConfigParser
 strict = True
 
 
-class ConfigParserTestCase(BasicTestCase):
+class ConfigParserTestCase(BasicTestCase, unittest.TestCase):
 config_class = configparser.ConfigParser
 
 def test_interpolation(self):
@@ -924,7 +924,7 @@
 self.assertRaises(ValueError, cf.add_section, self.default_section)
 
 
-class ConfigParserTestCaseNoInterpolation(BasicTestCase):
+class ConfigParserTestCaseNoInterpolation(BasicTestCase, unittest.TestCase):
 config_class = configparser.ConfigParser
 interpolation = None
 ini = textwrap.dedent("""
@@ -989,7 +989,7 @@
 class ConfigParserTestCaseNonStandardDefaultSection(ConfigParserTestCase):
 default_section = 'general'
 
-class MultilineValuesTestCase(BasicTestCase):
+class MultilineValuesTestCase(BasicTestCase, unittest.TestCase):
 config_class = configparser.ConfigParser
 wonderful_spam = ("I'm having spam spam spam spam "
 "spam spam spam beaked beans spam "
@@ -1017,7 +1017,7 @@
 self.assertEqual(cf_from_file.get('section8', 'lovely_spam4'),
 self.wonderful_spam.replace('\t\n', '\n'))
 
-class RawConfigParserTestCase(BasicTestCase):
+class RawConfigParserTestCase(BasicTestCase, unittest.TestCase):
 config_class = configparser.RawConfigParser
 
 def test_interpolation(self):
@@ -1064,7 +1064,7 @@
 comment_prefixes = ('//', '"')
 inline_comment_prefixes = ('//', '"')
 
-class RawConfigParserTestSambaConf(CfgParserTestCaseClass):
+class RawConfigParserTestSambaConf(CfgParserTestCaseClass, unittest.TestCase):
 config_class = configparser.RawConfigParser
 comment_prefixes = ('#', ';', '----')
 inline_comment_prefixes = ('//',)
@@ -1084,7 +1084,7 @@
 self.assertEqual(cf.get("global", "hosts allow"), "127.")
 self.assertEqual(cf.get("tmp", "echo command"), "cat %s; rm %s")
 
-class ConfigParserTestCaseExtendedInterpolation(BasicTestCase):
+class ConfigParserTestCaseExtendedInterpolation(BasicTestCase, unittest.TestCase):
 config_class = configparser.ConfigParser
 interpolation = configparser.ExtendedInterpolation()
 default_section = 'common'
@@ -1258,7 +1258,7 @@
 class ConfigParserTestCaseNoValue(ConfigParserTestCase):
 allow_no_value = True
 
-class ConfigParserTestCaseTrickyFile(CfgParserTestCaseClass):
+class ConfigParserTestCaseTrickyFile(CfgParserTestCaseClass, unittest.TestCase):
 config_class = configparser.ConfigParser
 delimiters = {'='}
 comment_prefixes = {'#'}
@@ -1355,7 +1355,7 @@
 "o4 = 1\n\n")
 
 
-class CompatibleTestCase(CfgParserTestCaseClass):
+class CompatibleTestCase(CfgParserTestCaseClass, unittest.TestCase):
 config_class = configparser.RawConfigParser
 comment_prefixes = '#;'
 inline_comment_prefixes = ';'
@@ -1377,7 +1377,7 @@
 self.assertEqual(cf.get('Commented Bar', 'quirk'),
 'this;is not a comment')
 
-class CopyTestCase(BasicTestCase):
+class CopyTestCase(BasicTestCase, unittest.TestCase):
 config_class = configparser.ConfigParser
 
 def fromstring(self, string, defaults=None):
@@ -1713,27 +1713,5 @@
 self.assertEqual(s['k3'], 'v3;#//still v3# and still v3')
 
 
-def test_main():
- support.run_unittest(
- ConfigParserTestCase,
- ConfigParserTestCaseNonStandardDelimiters,
- ConfigParserTestCaseNoValue,
- ConfigParserTestCaseExtendedInterpolation,
- ConfigParserTestCaseLegacyInterpolation,
- ConfigParserTestCaseNoInterpolation,
- ConfigParserTestCaseTrickyFile,
- MultilineValuesTestCase,
- RawConfigParserTestCase,
- RawConfigParserTestCaseNonStandardDelimiters,
- RawConfigParserTestSambaConf,
- SortedTestCase,
- Issue7005TestCase,
- StrictTestCase,
- CompatibleTestCase,
- CopyTestCase,
- ConfigParserTestCaseNonStandardDefaultSection,
- ReadFileTestCase,
- CoverageOneHundredTestCase,
- ExceptionPicklingTestCase,
- InlineCommentStrippingTestCase,
- )
+if __name__ == '__main__':
+ unittest.main()
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -620,6 +620,9 @@
 
 - Issue #16836: Enable IPv6 support even if IPv6 is disabled on the build host.
 
+- Issue #16925: test_configparser now works with unittest test discovery.
+ Patch by Zachary Ware.
+
 - Issue #16918: test_codecs now works with unittest test discovery.
 Patch by Zachary Ware.
 
-- 
Repository URL: http://hg.python.org/cpython
