changeset:   90686:8885fc2e92b3
parent:      90684:197ac5d79456
parent:      90685:20db5e9086d4
user:        doko@ubuntu.com
date:        Tue May 13 11:30:17 2014 +0200
files:       Misc/NEWS
description:
Merge from 3.4:
- Issue #17756: Fix test_code test when run from the installed location.


diff -r 197ac5d79456 -r 8885fc2e92b3 Lib/test/test_code_module.py
--- a/Lib/test/test_code_module.py	Tue May 13 10:50:15 2014 +0200
+++ b/Lib/test/test_code_module.py	Tue May 13 11:30:17 2014 +0200
@@ -51,7 +51,7 @@
         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")
diff -r 197ac5d79456 -r 8885fc2e92b3 Misc/NEWS
--- a/Misc/NEWS	Tue May 13 10:50:15 2014 +0200
+++ b/Misc/NEWS	Tue May 13 11:30:17 2014 +0200
@@ -456,6 +456,8 @@
 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