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

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

    Date: Saturday, June 30, 2012 @ 13:24:22
  Author: jtaylor-guest
Revision: 22383

add except-shadows-builtin-fix.patch

Added:
  packages/ipython/trunk/debian/patches/except-shadows-builtin-fix.patch
Modified:
  packages/ipython/trunk/debian/changelog
  packages/ipython/trunk/debian/patches/series

Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog	2012-06-30 13:24:16 UTC (rev 22382)
+++ packages/ipython/trunk/debian/changelog	2012-06-30 13:24:22 UTC (rev 22383)
@@ -4,11 +4,12 @@
     No repackging necessary anymore, js sources available in external
     minified variants are not installed
   * refresh patches, drop upstream applied full-qt-imports 
+  * add except-shadows-builtin-fix.patch
   * drop libjs-jquery-ui dependency, use the embedded development branch
   * don't compress the examples
   * remove executable permissions on embedded codemirror files
 
- -- Julian Taylor <jtaylor.debian at googlemail.com>  Sat, 30 Jun 2012 11:24:57 +0200
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Sat, 30 Jun 2012 12:37:21 +0200
 
 ipython (0.12.1+dfsg-2) unstable; urgency=low
 

Added: packages/ipython/trunk/debian/patches/except-shadows-builtin-fix.patch
===================================================================
--- packages/ipython/trunk/debian/patches/except-shadows-builtin-fix.patch	                        (rev 0)
+++ packages/ipython/trunk/debian/patches/except-shadows-builtin-fix.patch	2012-06-30 13:24:22 UTC (rev 22383)
@@ -0,0 +1,14 @@
+Description: fix except-shadows-builtin
+Author: Julian Taylor <jtaylor.debian at googlemail.com>
+Bug: https://github.com/ipython/ipython/issues/2056
+--- a/IPython/core/magics/osm.py
++++ b/IPython/core/magics/osm.py
+@@ -684,7 +684,7 @@
+ 
+         try :
+             cont = self.shell.find_user_code(parameter_s)
+-        except ValueError, IOError:
++        except (ValueError, IOError):
+             print "Error: no such file, variable, URL, history range or macro"
+             return
+ 

Modified: packages/ipython/trunk/debian/patches/series
===================================================================
--- packages/ipython/trunk/debian/patches/series	2012-06-30 13:24:16 UTC (rev 22382)
+++ packages/ipython/trunk/debian/patches/series	2012-06-30 13:24:22 UTC (rev 22383)
@@ -5,3 +5,4 @@
 use-system-mathjax-if-available.patch
 parallel-2to3.patch
 shared-static-path.patch
+except-shadows-builtin-fix.patch