Merge with 3.4

2014-06-20 14:59:27 -04:00 · 2014-06-20 14:59:27 -04:00 · 49c02b62dd
parent 8c6f0b70dc fe928de955
commit 49c02b62dd
1 changed files with 1 additions and 1 deletions
--- a/Lib/test/test_pydoc.py
+++ b/Lib/test/test_pydoc.py
@ -746,7 +746,7 @@ class TestDescriptions(unittest.TestCase):
            try:
                pydoc.render_doc(name)
            except ImportError:
-                self.fail('finding the doc of {!r} failed'.format(o))
+                self.fail('finding the doc of {!r} failed'.format(name))

        for name in ('notbuiltins', 'strrr', 'strr.translate',
                     'str.trrrranslate', 'builtins.strrr',