[spyder] fix line ends in the ipython patch
Radek Novacek
rnovacek at fedoraproject.org
Mon Jan 2 11:24:10 UTC 2012
commit 54037750d635848ab4ba7fd92ebdc310560a48ca
Author: Radek Novacek <rnovacek at redhat.com>
Date: Mon Jan 2 12:24:00 2012 +0100
fix line ends in the ipython patch
spyder-2.1.6-fix-ipython-startup.patch | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
---
diff --git a/spyder-2.1.6-fix-ipython-startup.patch b/spyder-2.1.6-fix-ipython-startup.patch
index dcf830d..9cae128 100644
--- a/spyder-2.1.6-fix-ipython-startup.patch
+++ b/spyder-2.1.6-fix-ipython-startup.patch
@@ -1,12 +1,12 @@
diff -up spyder-2.1.6/spyderlib/widgets/externalshell/startup.py.fix-ipython-startup spyder-2.1.6/spyderlib/widgets/externalshell/startup.py
---- spyder-2.1.6/spyderlib/widgets/externalshell/startup.py.fix-ipython-startup 2012-01-02 12:00:48.005470637 +0100
-+++ spyder-2.1.6/spyderlib/widgets/externalshell/startup.py 2012-01-02 12:00:56.324674704 +0100
+--- spyder-2.1.6/spyderlib/widgets/externalshell/startup.py.fix-ipython-startup 2012-01-02 12:21:57.826148738 +0100
++++ spyder-2.1.6/spyderlib/widgets/externalshell/startup.py 2012-01-02 12:22:05.926362281 +0100
@@ -28,7 +28,7 @@ if os.environ.get('IPYTHON_KERNEL', Fals
-
- # IPython >=v0.11 Kernel
- from IPython.zmq.ipkernel import IPKernelApp
-- __ipythonkernel__ = IPKernelApp()
-+ __ipythonkernel__ = IPKernelApp().instance()
- __ipythonkernel__.initialize(sys.argv[1:])
- __ipythonshell__ = __ipythonkernel__.shell
- __ipythonkernel__.start()
+
+ # IPython >=v0.11 Kernel
+ from IPython.zmq.ipkernel import IPKernelApp
+- __ipythonkernel__ = IPKernelApp()
++ __ipythonkernel__ = IPKernelApp().instance()
+ __ipythonkernel__.initialize(sys.argv[1:])
+ __ipythonshell__ = __ipythonkernel__.shell
+ __ipythonkernel__.start()
More information about the scm-commits
mailing list