[Python-modules-commits] r18005 - in packages/pylons/trunk/debian (3 files)

[piotr at users.alioth.debian.org]

    Date: Tuesday, August 2, 2011 @ 21:04:15
  Author: piotr
Revision: 18005

Add ipython_0.11_compatibility patch (thanks to Julian Taylor)

Added:
  packages/pylons/trunk/debian/patches/ipython_0.11_compatibility.patch
Modified:
  packages/pylons/trunk/debian/changelog
  packages/pylons/trunk/debian/patches/series

Modified: packages/pylons/trunk/debian/changelog
===================================================================
--- packages/pylons/trunk/debian/changelog	2011-08-02 20:51:32 UTC (rev 18004)
+++ packages/pylons/trunk/debian/changelog	2011-08-02 21:04:15 UTC (rev 18005)
@@ -1,5 +1,6 @@
 pylons (1.0-2) unstable; urgency=low
 
+  * Add ipython_0.11_compatibility patch (thanks to Julian Taylor)
   * Add build-arch and build-indep targets to debian/rules 
   * Switch from dh_pysupport to dh_python2
   * Source format changed to 3.0 (quilt)

Added: packages/pylons/trunk/debian/patches/ipython_0.11_compatibility.patch
===================================================================
--- packages/pylons/trunk/debian/patches/ipython_0.11_compatibility.patch	                        (rev 0)
+++ packages/pylons/trunk/debian/patches/ipython_0.11_compatibility.patch	2011-08-02 21:04:15 UTC (rev 18005)
@@ -0,0 +1,22 @@
+Index: pylons-0.10/pylons/commands.py
+===================================================================
+--- pylons-0.10.orig/pylons/commands.py	2011-07-24 15:28:25.708719706 +0200
++++ pylons-0.10/pylons/commands.py	2011-07-24 15:28:31.848719709 +0200
+@@ -514,10 +514,14 @@
+                 raise ImportError()
+ 
+             # try to use IPython if possible
+-            from IPython.Shell import IPShellEmbed
++            try:
++                from IPython.frontend.terminal.embed import InteractiveShellEmbed
++                shell = InteractiveShellEmbed(banner2=banner)
++            except ImportError:
++                from IPython.Shell import IPShellEmbed
++                shell = IPShellEmbed(argv=self.args)
++                shell.set_banner(shell.IP.BANNER + '\n\n' + banner)
+ 
+-            shell = IPShellEmbed(argv=self.args)
+-            shell.set_banner(shell.IP.BANNER + '\n\n' + banner)
+             try:
+                 shell(local_ns=locs, global_ns={})
+             finally:

Modified: packages/pylons/trunk/debian/patches/series
===================================================================
--- packages/pylons/trunk/debian/patches/series	2011-08-02 20:51:32 UTC (rev 18004)
+++ packages/pylons/trunk/debian/patches/series	2011-08-02 21:04:15 UTC (rev 18005)
@@ -1 +1,2 @@
 move_data_outside_site-packages.patch
+ipython_0.11_compatibility.patch