[Python-checkins] cpython (merge 3.2 -> default): Merge

michael.foord python-checkins at python.org
Fri Sep 28 16:19:55 CEST 2012


http://hg.python.org/cpython/rev/b21e28790c03
changeset:   79210:b21e28790c03
parent:      79209:c76f1d78ff78
parent:      79203:0362d64c783a
user:        Michael Foord <michael at voidspace.org.uk>
date:        Fri Sep 28 15:19:45 2012 +0100
summary:
  Merge

files:
  Lib/unittest/runner.py           |   2 +-
  Lib/unittest/test/test_runner.py |  13 +++++++++++++
  Misc/NEWS                        |   2 ++
  3 files changed, 16 insertions(+), 1 deletions(-)


diff --git a/Lib/unittest/runner.py b/Lib/unittest/runner.py
--- a/Lib/unittest/runner.py
+++ b/Lib/unittest/runner.py
@@ -35,7 +35,7 @@
     separator2 = '-' * 70
 
     def __init__(self, stream, descriptions, verbosity):
-        super(TextTestResult, self).__init__()
+        super(TextTestResult, self).__init__(stream, descriptions, verbosity)
         self.stream = stream
         self.showAll = verbosity > 1
         self.dots = verbosity == 1
diff --git a/Lib/unittest/test/test_runner.py b/Lib/unittest/test/test_runner.py
--- a/Lib/unittest/test/test_runner.py
+++ b/Lib/unittest/test/test_runner.py
@@ -149,6 +149,19 @@
         self.assertEqual(runner.resultclass, unittest.TextTestResult)
 
 
+    def test_multiple_inheritance(self):
+        class AResult(unittest.TestResult):
+            def __init__(self, stream, descriptions, verbosity):
+                super(AResult, self).__init__(stream, descriptions, verbosity)
+
+        class ATextResult(unittest.TextTestResult, AResult):
+            pass
+
+        # This used to raise an exception due to TextTestResult not passing
+        # on arguments in its __init__ super call
+        ATextResult(None, None, 1)
+
+
     def testBufferAndFailfast(self):
         class Test(unittest.TestCase):
             def testFoo(self):
diff --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -38,6 +38,8 @@
 
 - Issue #16064: unittest -m claims executable is "python", not "python3"
 
+- Issue #12376: Pass on parameters in TextTestResult.__init__ super call
+
 - Issue #15222: Insert blank line after each message in mbox mailboxes
 
 - Issue #16013: Fix CSV Reader parsing issue with ending quote characters.

-- 
Repository URL: http://hg.python.org/cpython


More information about the Python-checkins mailing list