aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/dist.py
diff options
context:
space:
mode:
authorPJ Eby <distutils-sig@python.org>2006-04-24 20:52:59 +0000
committerPJ Eby <distutils-sig@python.org>2006-04-24 20:52:59 +0000
commit847ce20a9390a14d3c415d9127db4bf9b86af3cb (patch)
treec2493e37a3995d7862fedeec17d2ba9bb14ee9c2 /setuptools/dist.py
parent3f6ffbc76c79adac2905221aef8f03bef28999f7 (diff)
downloadexternal_python_setuptools-847ce20a9390a14d3c415d9127db4bf9b86af3cb.tar.gz
external_python_setuptools-847ce20a9390a14d3c415d9127db4bf9b86af3cb.tar.bz2
external_python_setuptools-847ce20a9390a14d3c415d9127db4bf9b86af3cb.zip
Backport 'module' fixes to 0.6
--HG-- branch : setuptools-0.6 extra : convert_revision : svn%3A6015fed2-1504-0410-9fe1-9d1591cc4771/sandbox/branches/setuptools-0.6%4045696
Diffstat (limited to 'setuptools/dist.py')
-rw-r--r--setuptools/dist.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/setuptools/dist.py b/setuptools/dist.py
index b1ebeb47..724d5c5d 100644
--- a/setuptools/dist.py
+++ b/setuptools/dist.py
@@ -624,10 +624,12 @@ class Distribution(_Distribution):
for ext in self.ext_modules or ():
if isinstance(ext,tuple):
- name,buildinfo = ext
- yield name
+ name, buildinfo = ext
else:
- yield ext.name
+ name = ext.name
+ if name.endswith('module'):
+ name = name[:-6]
+ yield name
# Install it throughout the distutils
for module in distutils.dist, distutils.core, distutils.cmd:
@@ -652,8 +654,6 @@ for module in distutils.dist, distutils.core, distutils.cmd:
-
-
class Feature:
"""A subset of the distribution that can be excluded if unneeded/wanted