[Python-checkins] r59983 - in sandbox/branches/setuptools-0.6: setuptools.txt setuptools/command/build_ext.py

[phillip.eby]

Author: phillip.eby
Date: Tue Jan 15 18:53:54 2008
New Revision: 59983

Modified:
   sandbox/branches/setuptools-0.6/setuptools.txt
   sandbox/branches/setuptools-0.6/setuptools/command/build_ext.py
Log:
Update Pyrex/swig_sources workaround for newer Pyrex versions
(backport)


Modified: sandbox/branches/setuptools-0.6/setuptools.txt
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools.txt	(original)
+++ sandbox/branches/setuptools-0.6/setuptools.txt	Tue Jan 15 18:53:54 2008
@@ -2616,6 +2616,8 @@
    non-Windows platforms, due to distutils not handling manifest file line
    endings correctly.
 
+ * Updated Pyrex support to work with Pyrex 0.9.6 and higher.
+
 0.6c7
  * Fixed ``distutils.filelist.findall()`` crashing on broken symlinks, and 
    ``egg_info`` command failing on new, uncommitted SVN directories.

Modified: sandbox/branches/setuptools-0.6/setuptools/command/build_ext.py
==============================================================================
--- sandbox/branches/setuptools-0.6/setuptools/command/build_ext.py	(original)
+++ sandbox/branches/setuptools-0.6/setuptools/command/build_ext.py	Tue Jan 15 18:53:54 2008
@@ -70,7 +70,7 @@
                 self.write_stub(package_dir or os.curdir, ext, True)
 
 
-    if _build_ext is not _du_build_ext:
+    if _build_ext is not _du_build_ext and not hasattr(_build_ext,'pyrex_sources'):
         # Workaround for problems using some Pyrex versions w/SWIG and/or 2.4
         def swig_sources(self, sources, *otherargs):
             # first do any Pyrex processing