[Python-checkins] cpython (merge 3.4 -> default): Merge from 3.4:

[matthias.klose]

http://hg.python.org/cpython/rev/8885fc2e92b3
changeset:   90686:8885fc2e92b3
parent:      90684:197ac5d79456
parent:      90685:20db5e9086d4
user:        doko at ubuntu.com
date:        Tue May 13 11:30:17 2014 +0200
summary:
  Merge from 3.4:
- Issue #17756: Fix test_code test when run from the installed location.

files:
  Lib/test/test_code_module.py |  2 +-
  Misc/NEWS                    |  2 ++
  2 files changed, 3 insertions(+), 1 deletions(-)


diff --git a/Lib/test/test_code_module.py b/Lib/test/test_code_module.py
--- a/Lib/test/test_code_module.py
+++ b/Lib/test/test_code_module.py
@@ -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 --git a/Misc/NEWS b/Misc/NEWS
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -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

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