Merge from 3.4:

- Issue #17756: Fix test_code test when run from the installed location.
This commit is contained in:
doko@ubuntu.com 2014-05-13 11:30:17 +02:00
commit 987831c945
2 changed files with 3 additions and 1 deletions

View File

@ -51,7 +51,7 @@ class TestInteractiveConsole(unittest.TestCase):
self.infunc.side_effect = ["undefined", EOFError('Finished')]
self.console.interact()
for call in self.stderr.method_calls:
if 'NameError:' in ''.join(call[1]):
if 'NameError' in ''.join(call[1]):
break
else:
raise AssertionError("No syntax error from console")

View File

@ -456,6 +456,8 @@ Documentation
Tests
-----
- Issue #17756: Fix test_code test when run from the installed location.
- Issue #17752: Fix distutils tests when run from the installed location.
- Issue #18604: Consolidated checks for GUI availability. All platforms now