#17871: merge with 3.3.

7168879e · Ezio Melotti · 6e6bee8d · 9c939bce · 7168879e · 7168879e
Kaydet (Commit) 7168879e authored May 07, 2013 tarafından Ezio Melotti
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 1 deletion

unittest.rst Doc/library/unittest.rst +2 -1

ACKS Misc/ACKS +1 -0

No files found.
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -1850,7 +1850,8 @@ Loading and running tests
   instead of repeatedly creating new instances.


-.. class:: TextTestRunner(stream=None, descriptions=True, verbosity=1, runnerclass=None, warnings=None)
+.. class:: TextTestRunner(stream=None, descriptions=True, verbosity=1, failfast=False, \
+                          buffer=False, resultclass=None, warnings=None)

   A basic test runner implementation that outputs results to a stream. If *stream*
   is ``None``, the default, :data:`sys.stderr` is used as the output stream. This class

--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -208,6 +208,7 @@ Godefroid Chapelle
 Brad Chapman
 Greg Chapman
 Mitch Chapman
+Yogesh Chaudhari
 David Chaum
 Nicolas Chauvat
 Jerry Chen