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

[terry.reedy]

http://hg.python.org/cpython/rev/26511010988b
changeset:   86934:26511010988b
parent:      86932:8d93ad260714
parent:      86933:2c191b0b5e7a
user:        Terry Jan Reedy <tjreedy at udel.edu>
date:        Mon Nov 04 21:44:17 2013 -0500
summary:
  Merge with 3.3

files:
  Lib/test/test_pydoc.py |  2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_pydoc.py b/Lib/test/test_pydoc.py
--- a/Lib/test/test_pydoc.py
+++ b/Lib/test/test_pydoc.py
@@ -470,7 +470,7 @@
     def test_namedtuple_public_underscore(self):
         NT = namedtuple('NT', ['abc', 'def'], rename=True)
         with captured_stdout() as help_io:
-            help(NT)
+            pydoc.help(NT)
         helptext = help_io.getvalue()
         self.assertIn('_1', helptext)
         self.assertIn('_replace', helptext)

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