Imported Upstream version 1.2.1

diff --git a/CHANGES b/CHANGES
index 9daf05af4a8b6f2b1a2d989e53bdd6bc6f93eef6..342f9a982351f5921cf43d1ea4ad3f0b81bb35b9 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,6 +3,14 @@ Pygments changelog
 
 Issue numbers refer to the tracker at http://dev.pocoo.org/projects/pygments/.
 
+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
 -----------
 (codename Neujahr, released Jan 01, 2010)

diff --git a/PKG-INFO b/PKG-INFO
index fb8dabf29e8efe26811eaf419bc27788d01eb2c8..125a502a5ce02328eb801484d9fe4abb32ee120a 100644 (file)
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Pygments
-Version: 1.2
+Version: 1.2.1
 Summary: Pygments is a syntax highlighting package written in Python.
 Home-page: http://pygments.org/
 Author: Georg Brandl

diff --git a/Pygments.egg-info/PKG-INFO b/Pygments.egg-info/PKG-INFO
index fb8dabf29e8efe26811eaf419bc27788d01eb2c8..125a502a5ce02328eb801484d9fe4abb32ee120a 100644 (file)
--- a/Pygments.egg-info/PKG-INFO
+++ b/Pygments.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: Pygments
-Version: 1.2
+Version: 1.2.1
 Summary: Pygments is a syntax highlighting package written in Python.
 Home-page: http://pygments.org/
 Author: Georg Brandl

diff --git a/docs/build/api.html b/docs/build/api.html
index 39152b5b8874fabf335d12de95abfd6d1a3cfdd7..5f4c5cfe942fd55f9fdd99020bc98a6b8035e4dd 100644 (file)
--- a/docs/build/api.html
+++ b/docs/build/api.html
@@ -453,6 +453,6 @@ or a tuple, it is returned as a list.</dd>
 
   </div>
 </body>
-<!-- generated on: 2010-01-01 20:18:40.254170
+<!-- generated on: 2010-01-02 15:15:47.524465
      file id: api -->
 </html>
\ No newline at end of file

diff --git a/docs/build/authors.html b/docs/build/authors.html
index 161aa11f98ba5f5964f93ffa162d26f0a5a675ec..a201ca4fb7bcc172fadd2c99b056ec0d21e06902 100644 (file)
--- a/docs/build/authors.html
+++ b/docs/build/authors.html
@@ -274,6 +274,6 @@ div.toc h2 {
 
   </div>
 </body>
-<!-- generated on: 2010-01-01 20:18:40.605987
+<!-- generated on: 2010-01-02 15:15:47.866019
      file id: authors -->
 </html>
\ No newline at end of file

diff --git a/docs/build/changelog.html b/docs/build/changelog.html
index 80fcd7110a9710c7d6d566e5bc3d8a5acd4cee26..955810656af9d6277dcbcca06e493c98f9083847 100644 (file)
--- a/docs/build/changelog.html
+++ b/docs/build/changelog.html
@@ -213,6 +213,8 @@ div.toc h2 {
         <h2>Contents</h2>
         <ul class="contents">
         
+          <li><a href="#version-1-2-1">Version 1.2.1</a></li>
+        
           <li><a href="#version-1-2">Version 1.2</a></li>
         
           <li><a href="#version-1-1-1">Version 1.1.1</a></li>
@@ -247,6 +249,14 @@ div.toc h2 {
       </div>
     
     <p>Issue numbers refer to the tracker at <a class="reference external" href="http://dev.pocoo.org/projects/pygments/">http://dev.pocoo.org/projects/pygments/</a>.</p>
+<div class="section" id="version-1-2-1">
+<h3>Version 1.2.1</h3>
+<p>(bugfix release, released Jan 02, 2010)</p>
+<ul class="simple">
+<li>Fix mishandling of an ellipsis in place of the frames in a Python
+console traceback, resulting in clobbered output.</li>
+</ul>
+</div>
 <div class="section" id="version-1-2">
 <h3>Version 1.2</h3>
 <p>(codename Neujahr, released Jan 01, 2010)</p>
@@ -681,6 +691,6 @@ continuations.</li>
 
   </div>
 </body>
-<!-- generated on: 2010-01-01 20:18:40.685723
+<!-- generated on: 2010-01-02 15:15:47.950321
      file id: changelog -->
 </html>
\ No newline at end of file

diff --git a/docs/build/cmdline.html b/docs/build/cmdline.html
index c673c3fbe46bc338f14dab50ab0b18749c6b2ab6..c9122f0c8a779773d284ae4e005aa87c0a174020 100644 (file)
--- a/docs/build/cmdline.html
+++ b/docs/build/cmdline.html
@@ -348,6 +348,6 @@ formatter is the terminal encoding (<cite>sys.stdout.encoding</cite>).</li>
 
   </div>
 </body>
-<!-- generated on: 2010-01-01 20:18:41.039915
+<!-- generated on: 2010-01-02 15:15:48.296293
      file id: cmdline -->
 </html>
\ No newline at end of file

diff --git a/docs/build/filterdevelopment.html b/docs/build/filterdevelopment.html
index 75ff0282a9daa1bc1a59ac9c75b77aa5b628923b..281496eda2030c18ca16f6737ee883214d28f543 100644 (file)
--- a/docs/build/filterdevelopment.html
+++ b/docs/build/filterdevelopment.html
@@ -277,6 +277,6 @@ decorated function for filtering.</p>
 
   </div>
 </body>
-<!-- generated on: 2010-01-01 20:18:41.126814
+<!-- generated on: 2010-01-02 15:15:48.389027
      file id: filterdevelopment -->
 </html>
\ No newline at end of file

diff --git a/docs/build/filters.html b/docs/build/filters.html
index 8be21dce9ab0c1a0be31aef743b51662f3202f23..73ce0a3c009728d125fa02667813887d2417d52f 100644 (file)
--- a/docs/build/filters.html
+++ b/docs/build/filters.html
@@ -407,6 +407,6 @@ code to your styleguide.</p>
 
   </div>
 </body>
-<!-- generated on: 2010-01-01 20:18:41.186410
+<!-- generated on: 2010-01-02 15:15:48.454052
      file id: filters -->
 </html>
\ No newline at end of file

diff --git a/docs/build/formatterdevelopment.html b/docs/build/formatterdevelopment.html
index f50ae0444f1a661a381966f77f067cb80ce45b49..f57644427f63cd289f970ccd7de123f783985887 100644 (file)
--- a/docs/build/formatterdevelopment.html
+++ b/docs/build/formatterdevelopment.html
@@ -369,6 +369,6 @@ is up to the formatter) and has to return a string or <tt class="docutils litera
 
   </div>
 </body>
-<!-- generated on: 2010-01-01 20:18:41.334111
+<!-- generated on: 2010-01-02 15:15:48.603536
      file id: formatterdevelopment -->
 </html>
\ No newline at end of file

diff --git a/docs/build/formatters.html b/docs/build/formatters.html
index 028685a723c364e82ac1988fcf44672aee37367b..5f324b1dc8114b9aed554fee66cce05d9276a4fe 100644 (file)
--- a/docs/build/formatters.html
+++ b/docs/build/formatters.html
@@ -903,6 +903,6 @@ no support for common styles.</p>
 
   </div>
 </body>
-<!-- generated on: 2010-01-01 20:18:41.451497
+<!-- generated on: 2010-01-02 15:15:48.707382
      file id: formatters -->
 </html>
\ No newline at end of file

diff --git a/docs/build/index.html b/docs/build/index.html
index c62ff359f7702213c3e9da045d821e4078361be5..6b8b5f00bef9e9eb29ffc07b8a3f78e4ba72136a 100644 (file)
--- a/docs/build/index.html
+++ b/docs/build/index.html
@@ -256,6 +256,6 @@ look <a class="reference external" href="http://pygments.org/contribute/">here</
 
   </div>
 </body>
-<!-- generated on: 2010-01-01 20:18:42.001421
+<!-- generated on: 2010-01-02 15:15:49.234947
      file id: index -->
 </html>
\ No newline at end of file

diff --git a/docs/build/installation.html b/docs/build/installation.html
index c9e1b887921e93742f91acc827466703f9253b81..385cc208a3bd1d9bf9d0c45b1d0d4d005d93e3c2 100644 (file)
--- a/docs/build/installation.html
+++ b/docs/build/installation.html
@@ -276,6 +276,6 @@ is run, the sources are updated from Subversion. -->
 
   </div>
 </body>
-<!-- generated on: 2010-01-01 20:18:42.090829
+<!-- generated on: 2010-01-02 15:15:49.445590
      file id: installation -->
 </html>
\ No newline at end of file

diff --git a/docs/build/integrate.html b/docs/build/integrate.html
index 254fb65537d2d6e152ef6eabfd0248001b60cc57..c3b9c37899770a14237a4507d5ce3a5b3464ecce 100644 (file)
--- a/docs/build/integrate.html
+++ b/docs/build/integrate.html
@@ -250,6 +250,6 @@ colorize code via a simple menu option.  It can be found <a class="reference ext
 
   </div>
 </body>
-<!-- generated on: 2010-01-01 20:18:42.152952
+<!-- generated on: 2010-01-02 15:15:49.747016
      file id: integrate -->
 </html>
\ No newline at end of file

diff --git a/docs/build/lexerdevelopment.html b/docs/build/lexerdevelopment.html
index 488b14a8c1591eb9a7bac5a558e3fe2e642ee7dd..5b88f24b816bae9bee52a64b2aeeddda3361f734 100644 (file)
--- a/docs/build/lexerdevelopment.html
+++ b/docs/build/lexerdevelopment.html
@@ -686,6 +686,6 @@ the <tt class="docutils literal">get_tokens_unprocessed()</tt> method. The follo
 
   </div>
 </body>
-<!-- generated on: 2010-01-01 20:18:42.243381
+<!-- generated on: 2010-01-02 15:15:49.865110
      file id: lexerdevelopment -->
 </html>
\ No newline at end of file

diff --git a/docs/build/lexers.html b/docs/build/lexers.html
index 1ffb4eca837a79d070682833ac8734d613cc3850..698333359268aec51ad1df4b14ec0a5a09756eef 100644 (file)
--- a/docs/build/lexers.html
+++ b/docs/build/lexers.html
@@ -3255,6 +3255,6 @@ in the form <tt class="docutils literal">(name, aliases, filetypes, mimetypes)</
 
   </div>
 </body>
-<!-- generated on: 2010-01-01 20:18:42.538629
+<!-- generated on: 2010-01-02 15:15:50.249500
      file id: lexers -->
 </html>
\ No newline at end of file

diff --git a/docs/build/moinmoin.html b/docs/build/moinmoin.html
index cd897019b457d8ba10ea76f1d24bbd58ac585160..7c7a3256e5142303bc20565739665668d03d2126 100644 (file)
--- a/docs/build/moinmoin.html
+++ b/docs/build/moinmoin.html
@@ -240,6 +240,6 @@ can set the <tt class="docutils literal">INLINESTYLES</tt> option to True.</p>
 
   </div>
 </body>
-<!-- generated on: 2010-01-01 20:18:44.336595
+<!-- generated on: 2010-01-02 15:15:52.109970
      file id: moinmoin -->
 </html>
\ No newline at end of file

diff --git a/docs/build/plugins.html b/docs/build/plugins.html
index dfe88045bdf73e43be04fac5f0a1368458372622..f0ec742dc9f09aab612125143770455553184ff8 100644 (file)
--- a/docs/build/plugins.html
+++ b/docs/build/plugins.html
@@ -289,6 +289,6 @@ distribution.</p>
 
   </div>
 </body>
-<!-- generated on: 2010-01-01 20:18:44.382671
+<!-- generated on: 2010-01-02 15:15:52.152696
      file id: plugins -->
 </html>
\ No newline at end of file

diff --git a/docs/build/quickstart.html b/docs/build/quickstart.html
index 14368a37ac58ed09936498e90458c88463ae3b6a..9d387d539a8e7b186850d61d8fb2172fd79c89e8 100644 (file)
--- a/docs/build/quickstart.html
+++ b/docs/build/quickstart.html
@@ -385,6 +385,6 @@ $ pygmentize -S default -f html > style.css
 
   </div>
 </body>
-<!-- generated on: 2010-01-01 20:18:44.456825
+<!-- generated on: 2010-01-02 15:15:52.223464
      file id: quickstart -->
 </html>
\ No newline at end of file

diff --git a/docs/build/rstdirective.html b/docs/build/rstdirective.html
index feaef624bca067b1121e28e9cdcdc37825f60f32..d2522b25353cfe6ef24a19451bab113cb638cbf3 100644 (file)
--- a/docs/build/rstdirective.html
+++ b/docs/build/rstdirective.html
@@ -224,6 +224,6 @@ if the `handlecodeblocks` option is true. -->
 
   </div>
 </body>
-<!-- generated on: 2010-01-01 20:18:44.580164
+<!-- generated on: 2010-01-02 15:15:52.337785
      file id: rstdirective -->
 </html>
\ No newline at end of file

diff --git a/docs/build/styles.html b/docs/build/styles.html
index 27d2114011181e73e056ee09cac44f049a0b76a1..3fab972891863806f35f949ca0f2fa7f27912819 100644 (file)
--- a/docs/build/styles.html
+++ b/docs/build/styles.html
@@ -336,6 +336,6 @@ a way to iterate over all styles:</p>
 
   </div>
 </body>
-<!-- generated on: 2010-01-01 20:18:44.618066
+<!-- generated on: 2010-01-02 15:15:52.399785
      file id: styles -->
 </html>
\ No newline at end of file

diff --git a/docs/build/tokens.html b/docs/build/tokens.html
index 68247a24900e7555c6a68e7302a5881573a3f77a..f65b32e9bf6d454dbaf44e0a4557fbe82adc070f 100644 (file)
--- a/docs/build/tokens.html
+++ b/docs/build/tokens.html
@@ -536,6 +536,6 @@ highlight a programming language but a patch file.</p>
 
   </div>
 </body>
-<!-- generated on: 2010-01-01 20:18:44.729344
+<!-- generated on: 2010-01-02 15:15:52.504228
      file id: tokens -->
 </html>
\ No newline at end of file

diff --git a/docs/build/unicode.html b/docs/build/unicode.html
index d6851ca213595b793db5f6426b3723498df329e9..37da05b55df472324d7458a0cc04ac64fb81eeb7 100644 (file)
--- a/docs/build/unicode.html
+++ b/docs/build/unicode.html
@@ -244,6 +244,6 @@ input and output encodings.</p>
 
   </div>
 </body>
-<!-- generated on: 2010-01-01 20:18:44.977011
+<!-- generated on: 2010-01-02 15:15:52.740014
      file id: unicode -->
 </html>
\ No newline at end of file

diff --git a/pygments/__init__.py b/pygments/__init__.py
index 9a0a273fbb6eb2693fe5b3d72b04c897a557a58b..5a31ccfdeede40853dfb3f7669a513849d8422f8 100644 (file)
--- a/pygments/__init__.py
+++ b/pygments/__init__.py
@@ -25,7 +25,7 @@
     :license: BSD, see LICENSE for details.
 """
 
-__version__ = '1.2'
+__version__ = '1.2.1'
 __docformat__ = 'restructuredtext'
 
 __all__ = ['lex', 'format', 'highlight']

diff --git a/pygments/lexers/agile.py b/pygments/lexers/agile.py
index 40f29c5e439e404da8740b447e16ebe07d5dddc7..01daa990676d4f8a5a69d8e8bc6b9916c25146d2 100644 (file)
--- a/pygments/lexers/agile.py
+++ b/pygments/lexers/agile.py
@@ -319,8 +319,10 @@ class PythonConsoleLexer(Lexer):
                 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:]

diff --git a/setup.py b/setup.py
index 45537a49ce1504fc97fd6fc69643cef47d47f89e..1242d3c6f45b5e74fff79035261fc2286975278e 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -46,7 +46,7 @@ except ImportError:
 
 setup(
     name = 'Pygments',
-    version = '1.2',
+    version = '1.2.1',
     url = 'http://pygments.org/',
     license = 'BSD License',
     author = 'Georg Brandl',

diff --git a/tests/examplefiles/pycon_test.pycon b/tests/examplefiles/pycon_test.pycon
index 5ed452e173a887e5be1c94425f1d5cc79fd47e30..ff702864543a37debbc2423b85b090c110dfadc3 100644 (file)
--- a/tests/examplefiles/pycon_test.pycon
+++ b/tests/examplefiles/pycon_test.pycon
@@ -6,3 +6,9 @@ SyntaxError: invalid syntax
 >>> 
 KeyboardInterrupt
 >>>
+
+>>> 1/0
+Traceback (most recent call last):
+...
+ZeroDivisionError
+