Backport 1.6->1.7: Skip the test_nocaret test when running as jython.

Jython happens to add a caret in this case too.

diff --git a/Lib/test/test_traceback.py b/Lib/test/test_traceback.py
index 1b0a1245445a54335fa582592166c4fcd6e85931..37387fd338ba677c57ac4acfc41c68daad126f91 100644 (file)
--- a/Lib/test/test_traceback.py
+++ b/Lib/test/test_traceback.py
@@ -1,7 +1,7 @@
 """Test cases for traceback module"""
 
 import unittest
-from test_support import run_unittest
+from test_support import run_unittest, is_jython
 
 import traceback
 
@@ -32,6 +32,9 @@ class TracebackCases(unittest.TestCase):
         self.assert_(err[1].strip() == "return x!")
 
     def test_nocaret(self):
+        if is_jython:
+            # jython adds a caret in this case (why shouldn't it?)
+            return
         err = self.get_exception_format(self.syntax_error_without_caret,
                                         SyntaxError)
         self.assert_(len(err) == 3)