diff options
| author | Ezio Melotti <ezio.melotti@gmail.com> | 2013-03-10 01:29:55 (GMT) | 
|---|---|---|
| committer | Ezio Melotti <ezio.melotti@gmail.com> | 2013-03-10 01:29:55 (GMT) | 
| commit | 081a55b09049f67bcd71d367645a91541ae4454d (patch) | |
| tree | 054e8ab3fc8c69f1692045f174fd7ccee8b31b4a | |
| parent | 492390333e7786db6491da0f02ed0224bca57699 (diff) | |
| parent | a51be4c1360bbff2fde058331c34f9b649a65934 (diff) | |
| download | cpython-081a55b09049f67bcd71d367645a91541ae4454d.zip cpython-081a55b09049f67bcd71d367645a91541ae4454d.tar.gz cpython-081a55b09049f67bcd71d367645a91541ae4454d.tar.bz2 | |
#11963: merge with 3.3.
| -rw-r--r-- | 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 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""" | 
