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

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

    Date: Tuesday, February 25, 2014 @ 20:12:09
  Author: jtaylor-guest
Revision: 27930

debianize-error-messages.patch: fix no zmq message to raise an exception

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

Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog	2014-02-25 20:09:22 UTC (rev 27929)
+++ packages/ipython/trunk/debian/changelog	2014-02-25 20:12:09 UTC (rev 27930)
@@ -1,3 +1,9 @@
+ipython (1.2.1-2) unstable; urgency=medium
+
+  * debianize-error-messages.patch: fix no zmq message to raise an exception
+
+ -- Julian Taylor <jtaylor.debian at googlemail.com>  Tue, 25 Feb 2014 20:31:19 +0100
+
 ipython (1.2.1-1) unstable; urgency=low
 
   * New upstream bugfix release

Modified: packages/ipython/trunk/debian/patches/debianize-error-messages.patch
===================================================================
--- packages/ipython/trunk/debian/patches/debianize-error-messages.patch	2014-02-25 20:09:22 UTC (rev 27929)
+++ packages/ipython/trunk/debian/patches/debianize-error-messages.patch	2014-02-25 20:12:09 UTC (rev 27930)
@@ -71,11 +71,9 @@
      out = TextIOWrapper(BytesIO(out), encoding, 'replace').read()
 --- a/IPython/parallel/__init__.py
 +++ b/IPython/parallel/__init__.py
-@@ -17,8 +17,15 @@ Authors:
- 
+@@ -18,7 +18,12 @@ Authors:
  import os
  import warnings
-+import sys
  
 -import zmq
 +try:
@@ -83,8 +81,7 @@
 +except ImportError:
 +    from IPython.utils import py3compat
 +    _py = "python3" if py3compat.PY3 else "python"
-+    print "Coult not import zmq module, please install %s-zmq" % _py
-+    sys.exit(1)
++    raise ImportError("Could not import zmq module, please install %s-zmq" % _py)
  
  from IPython.config.configurable import MultipleInstanceError
  from IPython.utils.zmqrelated import check_for_zmq