Commits

Georg Brandl  committed 21ca0b3

Fix mishandling of an ellipsis in place of the frames in a Python
console traceback, resulting in clobbered output.

  • Participants
  • Parent commits 5949a4b
  • Branches trunk

Comments (0)

Files changed (3)

 
 Issue numbers refer to the tracker at http://dev.pocoo.org/projects/pygments/.
 
-Version 1.3
------------
-(in development, to be released in 2010)
+Version 1.2.1
+-------------
+(bugfix release, released Jan 02, 2010)
+
+* Fix mishandling of an ellipsis in place of the frames in a Python
+  console traceback, resulting in clobbered output.
 
 
 Version 1.2

File pygments/lexers/agile.py

                 insertions.append((len(curcode),
                                    [(0, Generic.Prompt, line[:4])]))
                 curcode += line[4:]
-            elif line.rstrip() == '...':
-                tb = 0
+            elif line.rstrip() == '...' and not tb:
+                # only a new >>> prompt can end an exception block
+                # otherwise an ellipsis in place of the traceback frames
+                # will be mishandled
                 insertions.append((len(curcode),
                                    [(0, Generic.Prompt, '...')]))
                 curcode += line[3:]

File tests/examplefiles/pycon_test.pycon

 >>> 
 KeyboardInterrupt
 >>>
+
+>>> 1/0
+Traceback (most recent call last):
+...
+ZeroDivisionError
+