Backport 'module' fixes to 0.6

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