[Python-modules-commits] r23602 - in packages/ipython/trunk/debian (3 files)

[jtaylor-guest at users.alioth.debian.org]

    Date: Tuesday, February 26, 2013 @ 18:07:08
  Author: jtaylor-guest
Revision: 23602

linenoless-traceback.patch: fix crash on tracebacks without line numbers

Added:
  packages/ipython/trunk/debian/patches/linenoless-traceback.patch
Modified:
  packages/ipython/trunk/debian/changelog
  packages/ipython/trunk/debian/patches/series

Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog	2013-02-26 18:07:02 UTC (rev 23601)
+++ packages/ipython/trunk/debian/changelog	2013-02-26 18:07:08 UTC (rev 23602)
@@ -12,6 +12,7 @@
   * bump standard to 3.9.4, no changes required
   * add autopkgtests
   * Added-missing-quotes.patch: fix missing quotes
+  * linenoless-traceback.patch: fix crash on tracebacks without line numbers
 
  -- Julian Taylor <jtaylor.debian at googlemail.com>  Sat, 02 Feb 2013 11:14:27 +0100
 

Added: packages/ipython/trunk/debian/patches/linenoless-traceback.patch
===================================================================
--- packages/ipython/trunk/debian/patches/linenoless-traceback.patch	                        (rev 0)
+++ packages/ipython/trunk/debian/patches/linenoless-traceback.patch	2013-02-26 18:07:08 UTC (rev 23602)
@@ -0,0 +1,24 @@
+Description: fix tracebacks without line numbers
+ e.g. from lxml import etree; tree = etree.fromstring('<a></a>'); tree.find('/')
+Origin: 47260f547506dc3a871fa49b9302f6ab7f431b0c
+Author: Julian Taylor <jtaylor.debian at googlemail.com>
+
+--- a/IPython/core/ultratb.py
++++ b/IPython/core/ultratb.py
+@@ -567,10 +567,14 @@ class ListTB(TBTools):
+                 have_filedata = True
+                 #print 'filename is',filename  # dbg
+                 if not value.filename: value.filename = "<string>"
+-                list.append('%s  File %s"%s"%s, line %s%d%s\n' % \
++                if value.lineno:
++                    lineno = value.lineno
++                else:
++                    lineno = 'unknown'
++                list.append('%s  File %s"%s"%s, line %s%s%s\n' % \
+                         (Colors.normalEm,
+                          Colors.filenameEm, value.filename, Colors.normalEm,
+-                         Colors.linenoEm, value.lineno, Colors.Normal  ))
++                         Colors.linenoEm, lineno, Colors.Normal  ))
+                 if value.text is not None:
+                     i = 0
+                     while i < len(value.text) and value.text[i].isspace():

Modified: packages/ipython/trunk/debian/patches/series
===================================================================
--- packages/ipython/trunk/debian/patches/series	2013-02-26 18:07:02 UTC (rev 23601)
+++ packages/ipython/trunk/debian/patches/series	2013-02-26 18:07:08 UTC (rev 23602)
@@ -7,3 +7,4 @@
 shared-static-path.patch
 ma-python-cython.patch
 Added-missing-quotes.patch
+linenoless-traceback.patch