summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorBenjamin Peterson <benjamin@python.org>2010-10-29 04:02:30 (GMT)
committerBenjamin Peterson <benjamin@python.org>2010-10-29 04:02:30 (GMT)
commitc8850d0771192357b384b93efb4b0c8d0650471d (patch)
tree2345e4faf8fe5ea0049493cf993535a8ecdc2689 /Lib
parent98e2b452975f13b13052aeb9d166ed8a3ef45063 (diff)
downloadcpython-c8850d0771192357b384b93efb4b0c8d0650471d.zip
cpython-c8850d0771192357b384b93efb4b0c8d0650471d.tar.gz
cpython-c8850d0771192357b384b93efb4b0c8d0650471d.tar.bz2
Merged revisions 85817,85904 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k ........ r85817 | benjamin.peterson | 2010-10-23 22:41:46 -0500 (Sat, 23 Oct 2010) | 1 line tighten loop ........ r85904 | benjamin.peterson | 2010-10-28 22:28:14 -0500 (Thu, 28 Oct 2010) | 1 line decrement offset when it points to a newline (#10186 followup) ........
Diffstat (limited to 'Lib')
-rw-r--r--Lib/test/test_traceback.py4
1 files changed, 4 insertions, 0 deletions
diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
index d39322f..b2c7262 100644
--- a/Lib/test/test_traceback.py
+++ b/Lib/test/test_traceback.py
@@ -302,6 +302,10 @@ class BaseExceptionReportingTests:
raise SyntaxError('', ('', 0, 5, 'hello'))
msg = self.get_report(e).splitlines()
self.assertEqual(msg[-2], " ^")
+ def e():
+ exec("x = 5 | 4 |")
+ msg = self.get_report(e).splitlines()
+ self.assertEqual(msg[-2], ' ^')
class PyExcReportingTests(BaseExceptionReportingTests, unittest.TestCase):