Merge with 3.4

This commit is contained in:
Terry Jan Reedy 2014-06-20 14:59:27 -04:00
commit 49c02b62dd
1 changed files with 1 additions and 1 deletions

View File

@ -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',