summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEzio Melotti <ezio.melotti@gmail.com>2013-03-10 01:27:26 (GMT)
committerEzio Melotti <ezio.melotti@gmail.com>2013-03-10 01:27:26 (GMT)
commita51be4c1360bbff2fde058331c34f9b649a65934 (patch)
tree49f63ba1b7f298f8d8961357db0bd0e682662d3b
parent0d7333e0efc45e458932b026c7310b8c7ebb5b0b (diff)
parente7c329954c1df6e4698e2e155ef02cf7b1d38672 (diff)
downloadcpython-a51be4c1360bbff2fde058331c34f9b649a65934.zip
cpython-a51be4c1360bbff2fde058331c34f9b649a65934.tar.gz
cpython-a51be4c1360bbff2fde058331c34f9b649a65934.tar.bz2
#11963: merge with 3.2.
-rw-r--r--Lib/test/test_parser.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/Lib/test/test_parser.py b/Lib/test/test_parser.py
index b5e9053..e7968cc 100644
--- a/Lib/test/test_parser.py
+++ b/Lib/test/test_parser.py
@@ -615,7 +615,8 @@ class ParserStackLimitTestCase(unittest.TestCase):
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"""