Package: spyder
Version: 2.0.12-1
Severity: normal
Tags: patch
User: jtaylor.deb...@googlemail.com
Usertags: ipython-0.11

IPython 0.11 has been released last week [0,1]. It is currently
available in debian experimental.

In order to upgrade IPython in unstable your package needs to be updated
to deal with the new api and configuration system.
Some hints for migrating applications are available here:
http://wiki.ipython.org/Cookbook/Updating_code_that_uses_IPython_for_0.11

Attached a patch that should fix the issue while remaining compatible to
ipython < 0.11.

The documentation for the new version can be found here:
http://ipython.org/ipython-doc/rel-0.11/index.html

[0] http://mail.scipy.org/pipermail/ipython-dev/2011-July/008041.html
[1] http://ipython.org/ipython-doc/rel-0.11/whatsnew/version0.11.html









Index: spyder-2.0.12/spyderlib/widgets/externalshell/startup.py
===================================================================
--- spyder-2.0.12.orig/spyderlib/widgets/externalshell/startup.py	2011-08-05 18:00:38.767221743 +0200
+++ spyder-2.0.12/spyderlib/widgets/externalshell/startup.py	2011-08-05 18:07:10.247221694 +0200
@@ -178,9 +178,16 @@
             # For pyreadline v1.5-1.6 only:
             import pyreadline
             pyreadline.GetOutputFile = lambda: None
-        import IPython.Shell
-        del __is_ipython
-        __ipythonshell__ = IPython.Shell.start(user_ns={'runfile': runfile,
+        try:
+            from IPython.frontend.terminal.embed import InteractiveShellEmbed
+            del __is_ipython
+            __ipythonshell__ = InteractiveShellEmbed(user_ns={'runfile': runfile,
+                                                              'debugfile': debugfile})
+            __ipythonshell__.stdin_encoding = os.environ['SPYDER_ENCODING']
+        except ImportError:
+            import IPython.Shell
+            del __is_ipython
+            __ipythonshell__ = IPython.Shell.start(user_ns={'runfile': runfile,
                                                         'debugfile': debugfile})
-        __ipythonshell__.IP.stdin_encoding = os.environ['SPYDER_ENCODING']
+            __ipythonshell__.IP.stdin_encoding = os.environ['SPYDER_ENCODING']
         __ipythonshell__.mainloop()
Index: spyder-2.0.12/spyderlib/widgets/internalshell.py
===================================================================
--- spyder-2.0.12.orig/spyderlib/widgets/internalshell.py	2011-08-05 17:57:02.107221769 +0200
+++ spyder-2.0.12/spyderlib/widgets/internalshell.py	2011-08-05 18:00:19.047221745 +0200
@@ -15,7 +15,10 @@
 #----Builtins
 import __builtin__
 try:
-    from IPython.deep_reload import reload
+    try:
+        from IPython.lib.deepreload import reload
+    except ImportError:
+        from IPython.deep_reload import reload
     __builtin__.dreload = reload
 except ImportError:
     pass

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to