[Python-modules-commits] r18053 - in packages/python-netaddr/trunk/debian (3 files)

[bernat at users.alioth.debian.org]

    Date: Sunday, August 7, 2011 @ 07:37:24
  Author: bernat
Revision: 18053

Add support for ipython 0.11.

Added:
  packages/python-netaddr/trunk/debian/patches/636476-ipython-0.11.patch
Modified:
  packages/python-netaddr/trunk/debian/changelog
  packages/python-netaddr/trunk/debian/patches/series

Modified: packages/python-netaddr/trunk/debian/changelog
===================================================================
--- packages/python-netaddr/trunk/debian/changelog	2011-08-06 23:54:54 UTC (rev 18052)
+++ packages/python-netaddr/trunk/debian/changelog	2011-08-07 07:37:24 UTC (rev 18053)
@@ -1,9 +1,11 @@
-python-netaddr (0.7.5-4) UNRELEASED; urgency=low
+python-netaddr (0.7.5-4) unstable; urgency=low
 
   * Tests have moved. Update debian/runtests.py accordingly.
     Patch from Ubuntu. Closes: #633653.
+  * Support for ipython 0.11. Thanks to Julian Taylor.
+    Closes: #636476.
 
- -- Vincent Bernat <bernat at debian.org>  Wed, 13 Jul 2011 20:00:09 +0200
+ -- Vincent Bernat <bernat at debian.org>  Sun, 07 Aug 2011 09:05:16 +0200
 
 python-netaddr (0.7.5-3) unstable; urgency=low
 

Added: packages/python-netaddr/trunk/debian/patches/636476-ipython-0.11.patch
===================================================================
--- packages/python-netaddr/trunk/debian/patches/636476-ipython-0.11.patch	                        (rev 0)
+++ packages/python-netaddr/trunk/debian/patches/636476-ipython-0.11.patch	2011-08-07 07:37:24 UTC (rev 18053)
@@ -0,0 +1,37 @@
+Add support for ipython 0.11.
+
+diff --git a/netaddr/tools/netaddr b/netaddr/tools/netaddr
+index f0630ec..7bf92f3 100644
+--- a/netaddr/tools/netaddr
++++ b/netaddr/tools/netaddr
+@@ -15,18 +15,23 @@ from netaddr import *
+ from netaddr import IPAddress as IP, IPNetwork as CIDR
+ from netaddr import EUI as MAC
+ 
+-try:
+-    from IPython.Shell import IPShellEmbed
+-except ImportError:
+-    sys.stderr.write('IPython (http://ipython.scipy.org/) not found!')
+-    sys.exit(1)
+-
+ argv = sys.argv[1:]
+ 
+ banner = "\nnetaddr shell %s - %s\n" % (netaddr.__version__, __doc__)
+ exit_msg = "\nShare and enjoy!"
+ rc_override = None
+ 
+-ipshell = IPShellEmbed(argv, banner, exit_msg, rc_override)
++try:
++    try:
++        # ipython >= 0.11
++        from IPython.frontend.terminal.embed import InteractiveShellEmbed
++        ipshell = InteractiveShellEmbed(banner1=banner, exit_msg=exit_msg)
++    except ImportError:
++        # ipython < 0.11
++        from IPython.Shell import IPShellEmbed
++        ipshell = IPShellEmbed(argv, banner, exit_msg, rc_override)
++except ImportError:
++    sys.stderr.write('IPython (http://ipython.scipy.org/) not found!')
++    sys.exit(1)
+ 
+ ipshell()

Modified: packages/python-netaddr/trunk/debian/patches/series
===================================================================
--- packages/python-netaddr/trunk/debian/patches/series	2011-08-06 23:54:54 UTC (rev 18052)
+++ packages/python-netaddr/trunk/debian/patches/series	2011-08-07 07:37:24 UTC (rev 18053)
@@ -1 +1,2 @@
 631360-unpickling.patch
+636476-ipython-0.11.patch