[Python-modules-commits] r23075 - in packages/ipython/trunk/debian (2 files)

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

    Date: Sunday, November 25, 2012 @ 19:05:48
  Author: jtaylor-guest
Revision: 23075

keep the disabled patch at wish of release team

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

Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog	2012-11-25 17:49:24 UTC (rev 23074)
+++ packages/ipython/trunk/debian/changelog	2012-11-25 19:05:48 UTC (rev 23075)
@@ -3,7 +3,6 @@
   * update watch file to use github directly
     thanks to Bart Martens for the file
   * ipython-doc: break/replace ipython << 0.11-2 (Closes: #694280)
-  * delete except-shadows-builtin-fix.patch disabled in 0.13.1-1
 
  -- Julian Taylor <jtaylor.debian at googlemail.com>  Sun, 25 Nov 2012 11:55:50 +0000
 

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-11-25 19:05:48 UTC (rev 23075)
@@ -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
+