[SCM] A Python IDE for scientists branch, master, updated. debian/2.0.11-1-12-ga687c0c

[Picca Frédéric-Emma?==?UTF-8?Q?nuel]

The following commit has been merged in the master branch:
commit 38f30321bcbc5b26680d06c945c57277251bc2d3
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Fri Aug 5 21:48:31 2011 +0200

    add support for ipython-0.11

diff --git a/debian/changelog b/debian/changelog
index 3b42e07..9ccfbb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 spyder (2.0.12-2) UNRELEASED; urgency=low
 
   * debian/copyright fixed using config-edit
+  * debian/patches
+    - 0002-feature-forwarded-fix-for-ipython-0.11.patch (new)
+           Thanks Julian Taylor for the patch (Closes: #636726)
 
- -- Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>  Mon, 25 Jul 2011 23:08:14 +0200
+ -- Picca Frédéric-Emmanuel <picca at debian.org>  Fri, 05 Aug 2011 21:43:34 +0200
 
 spyder (2.0.12-1) unstable; urgency=low
 
diff --git a/debian/patches/0001-fix-documentation-installation.patch b/debian/patches/0001-fix-documentation-installation.patch
index d841263..65c716f 100644
--- a/debian/patches/0001-fix-documentation-installation.patch
+++ b/debian/patches/0001-fix-documentation-installation.patch
@@ -7,7 +7,7 @@ Subject: fix-documentation-installation
  1 files changed, 1 insertions(+), 1 deletions(-)
 
 diff --git a/spyderlib/config.py b/spyderlib/config.py
-index 3709e3c..8354978 100644
+index 9fbca59..38c82b6 100644
 --- a/spyderlib/config.py
 +++ b/spyderlib/config.py
 @@ -28,7 +28,7 @@ DOC_DEV_PATH = osp.join(DATA_DEV_PATH, 'doc')
diff --git a/debian/patches/0002-feature-forwarded-fix-for-ipython-0.11.patch b/debian/patches/0002-feature-forwarded-fix-for-ipython-0.11.patch
new file mode 100644
index 0000000..a5d96e5
--- /dev/null
+++ b/debian/patches/0002-feature-forwarded-fix-for-ipython-0.11.patch
@@ -0,0 +1,51 @@
+From: =?UTF-8?q?Picca=20Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
+Date: Fri, 5 Aug 2011 21:43:04 +0200
+Subject: feature-forwarded-fix-for-ipython-0.11
+
+---
+ spyderlib/widgets/externalshell/startup.py |   15 +++++++++++----
+ spyderlib/widgets/internalshell.py         |    5 ++++-
+ 2 files changed, 15 insertions(+), 5 deletions(-)
+
+diff --git a/spyderlib/widgets/externalshell/startup.py b/spyderlib/widgets/externalshell/startup.py
+index 92f4e54..cf8ae4d 100644
+--- a/spyderlib/widgets/externalshell/startup.py
++++ b/spyderlib/widgets/externalshell/startup.py
+@@ -178,9 +178,16 @@ if __name__ == "__main__":
+             # 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()
+diff --git a/spyderlib/widgets/internalshell.py b/spyderlib/widgets/internalshell.py
+index 9f1cd37..0230fe3 100644
+--- a/spyderlib/widgets/internalshell.py
++++ b/spyderlib/widgets/internalshell.py
+@@ -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
+-- 
diff --git a/debian/patches/series b/debian/patches/series
index d88d3bc..ae99ae4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 0001-fix-documentation-installation.patch
+0002-feature-forwarded-fix-for-ipython-0.11.patch

-- 
A Python IDE for scientists