[Python-checkins] cpython (merge 3.2 -> 3.3): #11963: merge with 3.2.

[ezio.melotti]

http://hg.python.org/cpython/rev/f683ca2b30e3
changeset:   82580:f683ca2b30e3
branch:      3.3
parent:      82576:185c923f21ec
parent:      82579:64b87578c071
user:        Ezio Melotti <ezio.melotti at gmail.com>
date:        Sun Mar 10 03:27:26 2013 +0200
summary:
  #11963: merge with 3.2.

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


diff --git a/Lib/test/test_parser.py b/Lib/test/test_parser.py
--- a/Lib/test/test_parser.py
+++ b/Lib/test/test_parser.py
@@ -615,7 +615,8 @@
         rc, out, err = assert_python_failure('-c', e)
         # parsing the expression will result in an error message
         # followed by a MemoryError (see #11963)
-        self.assertEqual(err, b's_push: parser stack overflow\nMemoryError')
+        self.assertIn(b's_push: parser stack overflow', err)
+        self.assertIn(b'MemoryError', err)
 
 class STObjectTestCase(unittest.TestCase):
     """Test operations on ST objects themselves"""

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