Merge lp:~jtaylor/ubuntu/natty/ipython/ipython-fix-777420 into lp:ubuntu/natty/ipython

[Julian Taylor]

Description: Fix blocking show
 remove the check for the gtk.set_interactive feature, always available in natty
 the check causes pylab.show() to block
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ipython/+bug/777420
Bug: https://github.com/ipython/ipython/issues/185
Applied-Upstream: 0.10.2
Origin: adapted from https://github.com/ivanov/ipython commits 8ed54e466932c, 7fb20baae1413

TEST CASE 1
cp /etc/matplotlibrc ~/.matplotlib/
# set backend: to GTKAgg in that file
ipython -pylab
plot([1,2])

# plot should show but doesn't
show()
# plot does not show or function blocks
TEST CASE end

from bug 777420 comment 8
TEST CASE2:
 1) install ipython, python-enthoughtbase, mayavi2
 2) Start "ipython -wthread", then use the following two commands:
 from enthought.mayavi import mlab
 mlab.test_contour3d()

=> the GUI window is unresponsive unless the 'show()' command is passed - this is fixed by the new package (see upstream report)
 END TEST CASE

[Barry Warsaw (barry)]

To see the fix in action, I just installed ipython and python-matplotlib, then did:

$ ipython -pylab -gthread

at the prompt, hit C-d and watch it hang. With this patch, ipython exits properly. The patch looks fine to me so I think it should be SRU'd. I'm not an ipython user but I couldn't detect any adverse effects from the patch. I'll get the SRU process started and follow up in the bug report. When the new package lands in natty-proposed, please test it.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-17 17:49:42 +0000
+++ debian/changelog	2011-05-25 14:41:21 +0000
@@ -1,3 +1,9 @@
+ipython (0.10.1-1ubuntu0.1) natty-proposed; urgency=low
+
+  * add patch to fix blocking show (LP: #777420)
+
+ -- Julian Taylor <[e-mail]>  Wed, 25 May 2011 13:15:38 +0200
+
 ipython (0.10.1-1) unstable; urgency=low
 
   * New upstream release.
 
=== added file 'debian/patches/fix_blocking_show.patch'
--- debian/patches/fix_blocking_show.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix_blocking_show.patch	2011-05-25 14:41:21 +0000
@@ -0,0 +1,42 @@
+Description: Fix blocking show
+ remove the check for the gtk.set_interactive feature, always available in natty
+ the check causes pylab.show() to block
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/ipython/+bug/777420
+Bug: https://github.com/ipython/ipython/issues/185
+Applied-Upstream: 0.10.2
+Origin: adapted from https://github.com/ivanov/ipython commits 8ed54e466932c, 7fb20baae1413
+Author: Julian Taylor <[e-mail]>
+Index: ipython/IPython/Shell.py
+===================================================================
+--- ipython.orig/IPython/Shell.py	2011-05-25 13:39:01.476670538 +0200
++++ ipython/IPython/Shell.py	2011-05-25 13:39:30.436670532 +0200
+@@ -778,7 +778,7 @@
+         ## # the user that he has a better option as well.
+         ## # XXX TODO better support when set_interactive is released
+         ## try:
+-        ##     gtk.set_interactive(False)
++        gtk.set_interactive(False)
+         ##     print "Your PyGtk has set_interactive(), so you can use the"
+         ##     print "more stable single-threaded Gtk mode."
+         ##     print "See https://bugs.launchpad.net/ipython/+bug/270856"
+@@ -1230,10 +1218,6 @@
+             else:
+                 # Any other backend, use plain Tk
+                 th_mode = 'tkthread'
+-
+-            # New versions of pygtk don't need the brittle threaded support.
+-            th_mode = check_gtk(th_mode)
+-                
+         return mpl_shell[th_mode]
+     else:
+         # No pylab requested, just plain threads
+@@ -1241,9 +1225,6 @@
+             th_mode = special_opts.pop()
+         except KeyError:
+             th_mode = 'tkthread'
+-
+-        # New versions of pygtk don't need the brittle threaded support.
+-        th_mode = check_gtk(th_mode)
+         return th_shell[th_mode]
+ 
+ 
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2011-02-17 17:49:42 +0000
+++ debian/patches/series	2011-05-25 14:41:21 +0000
@@ -2,3 +2,4 @@
 04_remove_shebang.patch
 05_fix_seteditor_example.patch
 06_ipythonwx_importerror.patch
+fix_blocking_show.patch