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

[ezio.melotti]

http://hg.python.org/cpython/rev/15ed67602ddf
changeset:   83666:15ed67602ddf
parent:      83663:e163c13b941c
parent:      83665:5dd076d441ec
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Tue May 07 09:47:08 2013 +0300
summary:
  #17871: merge with 3.3.

files:
  Doc/library/unittest.rst |  3 ++-
  Misc/ACKS                |  1 +
  2 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Doc/library/unittest.rst b/Doc/library/unittest.rst
--- a/Doc/library/unittest.rst
+++ b/Doc/library/unittest.rst
@@ -1850,7 +1850,8 @@
    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
diff --git a/Misc/ACKS b/Misc/ACKS
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -208,6 +208,7 @@
 Brad Chapman
 Greg Chapman
 Mitch Chapman
+Yogesh Chaudhari
 David Chaum
 Nicolas Chauvat
 Jerry Chen

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