[Python-modules-commits] r23422 - in packages/ipython/trunk/debian (3 files)

[jtaylor-guest at users.alioth.debian.org]

    Date: Saturday, February 2, 2013 @ 16:53:21
  Author: jtaylor-guest
Revision: 23422

ma-python-cython.patch

fix detection of cython modules for multiarch python (Closes: #697704)

Added:
  packages/ipython/trunk/debian/patches/ma-python-cython.patch
Modified:
  packages/ipython/trunk/debian/changelog
  packages/ipython/trunk/debian/patches/series

Modified: packages/ipython/trunk/debian/changelog
===================================================================
--- packages/ipython/trunk/debian/changelog	2013-02-02 16:53:16 UTC (rev 23421)
+++ packages/ipython/trunk/debian/changelog	2013-02-02 16:53:21 UTC (rev 23422)
@@ -6,6 +6,8 @@
     ipython (Closes: #695554)
     Requires ipython-doc.preinst to not lose copyright on upgrade
   * add ipython3 and ipython3-qtconsole desktop files (Closes: #693612)
+  * ma-python-cython.patch
+    fix detection of cython modules for multiarch python (Closes: #697704)
 
  -- Julian Taylor <jtaylor.debian at googlemail.com>  Sat, 02 Feb 2013 11:14:27 +0100
 

Added: packages/ipython/trunk/debian/patches/ma-python-cython.patch
===================================================================
--- packages/ipython/trunk/debian/patches/ma-python-cython.patch	                        (rev 0)
+++ packages/ipython/trunk/debian/patches/ma-python-cython.patch	2013-02-02 16:53:21 UTC (rev 23422)
@@ -0,0 +1,45 @@
+Description: fix cython module so extension for python3.3
+ imp.get_suffixes() returns all kind of junk, the first is not correct anymore
+Origin: backported from a1daa0286a867cda86e728e177d72a645b72c634
+Author: Julian Taylor <jtaylor.debian at googlemail.com>
+
+diff --git a/IPython/extensions/cythonmagic.py b/IPython/extensions/cythonmagic.py
+index 94f5e9c..0f539d2 100644
+--- a/IPython/extensions/cythonmagic.py
++++ b/IPython/extensions/cythonmagic.py
+@@ -146,7 +146,18 @@ class CythonMagics(Magics):
+         ctx = Context(cython_include_dirs, default_options)
+         key = code, sys.version_info, sys.executable, Cython.__version__
+         module_name = "_cython_magic_" + hashlib.md5(str(key).encode('utf-8')).hexdigest()
+-        so_ext = [ ext for ext,_,mod_type in imp.get_suffixes() if mod_type == imp.C_EXTENSION ][0]
++
++        dist = Distribution()
++        config_files = dist.find_config_files()
++        try:
++            config_files.remove('setup.cfg')
++        except ValueError:
++            pass
++        dist.parse_config_files(config_files)
++        build_extension = build_ext(dist)
++        build_extension.finalize_options()
++
++        so_ext = build_extension.get_ext_filename('')
+         module_path = os.path.join(lib_dir, module_name+so_ext)
+ 
+         if not os.path.exists(lib_dir):
+@@ -168,15 +179,6 @@ class CythonMagics(Magics):
+                 extra_compile_args = args.compile_args,
+                 libraries = args.lib,
+             )
+-            dist = Distribution()
+-            config_files = dist.find_config_files()
+-            try: 
+-                config_files.remove('setup.cfg')
+-            except ValueError:
+-                pass
+-            dist.parse_config_files(config_files)
+-            build_extension = build_ext(dist)
+-            build_extension.finalize_options()
+             try:
+                 build_extension.extensions = cythonize([extension], ctx=ctx, quiet=quiet)
+             except CompileError:

Modified: packages/ipython/trunk/debian/patches/series
===================================================================
--- packages/ipython/trunk/debian/patches/series	2013-02-02 16:53:16 UTC (rev 23421)
+++ packages/ipython/trunk/debian/patches/series	2013-02-02 16:53:21 UTC (rev 23422)
@@ -5,3 +5,4 @@
 use-system-mathjax-if-available.patch
 parallel-2to3.patch
 shared-static-path.patch
+ma-python-cython.patch