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

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

    Date: Tuesday, November 22, 2011 @ 20:36:47
  Author: jtaylor-guest
Revision: 19418

fix debianize-error-messages.patch to reraise unknown exceptions

Modified:
  packages/ipython/trunk/debian/changelog
  packages/ipython/trunk/debian/patches/debianize-error-messages.patch
  packages/ipython/trunk/debian/patches/series

Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog	2011-11-22 20:36:13 UTC (rev 19417)
+++ packages/ipython/trunk/debian/changelog	2011-11-22 20:36:47 UTC (rev 19418)
@@ -1,8 +1,9 @@
 ipython (0.11-2) experimental; urgency=low
 
   * add patch fix-version-checks-for-pyzmq-2.1.10.patch
+  * fix debianize-error-messages.patch to reraise unknown exceptions
 
- -- Julian Taylor <jtaylor.debian at googlemail.com>  Tue, 22 Nov 2011 20:32:21 +0100
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Tue, 22 Nov 2011 20:43:28 +0100
 
 ipython (0.11-1) experimental; urgency=low
 

Modified: packages/ipython/trunk/debian/patches/debianize-error-messages.patch
===================================================================
--- packages/ipython/trunk/debian/patches/debianize-error-messages.patch	2011-11-22 20:36:13 UTC (rev 19417)
+++ packages/ipython/trunk/debian/patches/debianize-error-messages.patch	2011-11-22 20:36:47 UTC (rev 19418)
@@ -3,11 +3,9 @@
 Subject: debianize error messages
 Forwarded: not-needed
 
-Index: trunk/IPython/scripts/ipython
-===================================================================
---- trunk.orig/IPython/scripts/ipython	2011-07-19 12:10:40.916829075 +0200
-+++ trunk/IPython/scripts/ipython	2011-07-19 12:11:06.836829059 +0200
-@@ -4,4 +4,8 @@
+--- a/IPython/scripts/ipython
++++ b/IPython/scripts/ipython
+@@ -4,4 +4,11 @@
  
  from IPython.frontend.terminal.ipapp import launch_new_instance
  
@@ -17,22 +15,24 @@
 +except ImportError as e:
 +  if "qt.console.qtconsoleapp" in e.message:
 +    print "Could not start qtconsole. Please install ipython-qtconsole"
-Index: trunk/IPython/zmq/__init__.py
-===================================================================
---- trunk.orig/IPython/zmq/__init__.py	2011-07-19 12:11:20.136829049 +0200
-+++ trunk/IPython/zmq/__init__.py	2011-07-19 12:12:00.956829023 +0200
-@@ -16,12 +16,12 @@
- try:
-     import zmq
- except ImportError:
--    raise ImportError("IPython.zmq requires pyzmq >= %s"%minimum_pyzmq_version)
-+    raise ImportError("IPython.zmq requires python-zmq >= %s"%minimum_pyzmq_version)
++  else:
++    # if there is no clue on the cause -- just re-raise
++    raise
+--- a/IPython/zmq/__init__.py
++++ b/IPython/zmq/__init__.py
+@@ -18,13 +18,13 @@
+     try:
+         import zmq
+     except ImportError:
+-        raise ImportError("%s requires pyzmq >= %s"%(module, minimum_version))
++        raise ImportError("%s requires python-zmq >= %s"%(module, minimum_version))
  
- pyzmq_version = zmq.__version__
+     pyzmq_version = zmq.__version__
+     vlist = [int(n) for n in re.findall(r'\d+', pyzmq_version)]
  
- if pyzmq_version < minimum_pyzmq_version:
--    raise ImportError("IPython.zmq requires pyzmq >= %s, but you have %s"%(
-+    raise ImportError("IPython.zmq requires python-zmq >= %s, but you have %s"%(
-                     minimum_pyzmq_version, pyzmq_version))
+     if 'dev' not in pyzmq_version and vlist < min_vlist:
+-        raise ImportError("%s requires pyzmq >= %s, but you have %s"%(
++        raise ImportError("%s requires python-zmq >= %s, but you have %s"%(
+                         module, minimum_version, pyzmq_version))
  
- del pyzmq_version
+     if zmq.zmq_version() >= '3.0.0':

Modified: packages/ipython/trunk/debian/patches/series
===================================================================
--- packages/ipython/trunk/debian/patches/series	2011-11-22 20:36:13 UTC (rev 19417)
+++ packages/ipython/trunk/debian/patches/series	2011-11-22 20:36:47 UTC (rev 19418)
@@ -1,4 +1,4 @@
-debianize-error-messages.patch
 05_fix_seteditor_example.patch
 07_use_lightbg.patch
 fix-version-checks-for-pyzmq-2.1.10.patch
+debianize-error-messages.patch