From: Georg Brandl <georg@python.org>
Date: Thu, 4 Jun 2009 18:59:58 +0000 (+0000)
Subject: Add test for #3684.
X-Git-Tag: v2.7a1~1025
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4da2fa5517e2bc844457804b48175e6838cae762;p=thirdparty%2FPython%2Fcpython.git

Add test for #3684.
---

diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
index 5cd08eeff3de..1140a942b9d9 100644
--- a/Lib/test/test_traceback.py
+++ b/Lib/test/test_traceback.py
@@ -24,6 +24,9 @@ class TracebackCases(unittest.TestCase):
     def syntax_error_with_caret(self):
         compile("def fact(x):\n\treturn x!\n", "?", "exec")
 
+    def syntax_error_with_caret_2(self):
+        compile("1 +\n", "?", "exec")
+
     def syntax_error_without_caret(self):
         # XXX why doesn't compile raise the same traceback?
         import test.badsyntax_nocaret
@@ -39,6 +42,12 @@ class TracebackCases(unittest.TestCase):
         self.assert_("^" in err[2]) # third line has caret
         self.assert_(err[1].find("!") == err[2].find("^")) # in the right place
 
+        err = self.get_exception_format(self.syntax_error_with_caret_2,
+                                        SyntaxError)
+        self.assert_("^" in err[2]) # third line has caret
+        self.assert_(err[2].count('\n') == 1) # and no additional newline
+        self.assert_(err[1].find("+") == err[2].find("^")) # in the right place
+
     def test_nocaret(self):
         if is_jython:
             # jython adds a caret in this case (why shouldn't it?)