aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2016-01-24 11:49:11 -0500
committerJason R. Coombs <jaraco@jaraco.com>2016-01-24 11:49:11 -0500
commit57d450a4e0485c8c9db04a5b6d02615c3798f418 (patch)
treee0c417809760332550e40799df274261fc11c273
parente7f9dab06dc2515fe11e7f31ea948eed5e141470 (diff)
downloadexternal_python_setuptools-57d450a4e0485c8c9db04a5b6d02615c3798f418.tar.gz
external_python_setuptools-57d450a4e0485c8c9db04a5b6d02615c3798f418.tar.bz2
external_python_setuptools-57d450a4e0485c8c9db04a5b6d02615c3798f418.zip
Also hide Cython when hiding setuptools, as setuptools will have imported Cython and Cython references the distutils.Extension. Fixes #488.19.6b1
-rw-r--r--CHANGES.txt3
-rwxr-xr-xsetuptools/sandbox.py6
2 files changed, 8 insertions, 1 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index c82ec5a5..28d2ef63 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -16,6 +16,9 @@ CHANGES
expose the desired functionality. For example::
$ python -m setuptools.launch setup.py develop
+* Issue #488: Fix dual manifestation of Extension class in
+ extension packages installed as dependencies when Cython
+ is present.
19.5
----
diff --git a/setuptools/sandbox.py b/setuptools/sandbox.py
index 668bcac7..23e296b1 100755
--- a/setuptools/sandbox.py
+++ b/setuptools/sandbox.py
@@ -207,8 +207,12 @@ def _needs_hiding(mod_name):
True
>>> _needs_hiding('distutils')
True
+ >>> _needs_hiding('os')
+ False
+ >>> _needs_hiding('Cython')
+ True
"""
- pattern = re.compile('(setuptools|pkg_resources|distutils)(\.|$)')
+ pattern = re.compile('(setuptools|pkg_resources|distutils|Cython)(\.|$)')
return bool(pattern.match(mod_name))