Commits

Anonymous committed ed9a07a

Backport 'module' fixes to 0.6

  • Participants
  • Parent commits 7287d5f
  • Branches setuptools-0.6

Comments (0)

Files changed (3)

File setuptools/command/bdist_egg.py

 from types import CodeType
 from setuptools.extension import Library
 
+def strip_module(filename):
+    if '.' in filename:
+        filename = os.path.splitext(filename)[0]
+    if filename.endswith('module'):
+        filename = filename[:-6]
+    return filename
+
 def write_stub(resource, pyfile):
     f = open(pyfile,'w')
     f.write('\n'.join([
 
 
 
-
-
-
-
-
-
-
 class bdist_egg(Command):
 
     description = "create an \"egg\" distribution"
         to_compile = []
         for (p,ext_name) in enumerate(ext_outputs):
             filename,ext = os.path.splitext(ext_name)
-            pyfile = os.path.join(self.bdist_dir, filename + '.py')
+            pyfile = os.path.join(self.bdist_dir, strip_module(filename)+'.py')
             self.stubs.append(pyfile)
             log.info("creating stub loader for %s" % ext_name)
             if not self.dry_run:

File setuptools/command/easy_install.py

         to_compile = []
         native_libs = []
         top_level = {}
-
         def process(src,dst):
             for old,new in prefixes:
                 if src.startswith(old):
                     dst = os.path.join(egg_tmp, *parts)
                     dl = dst.lower()
                     if dl.endswith('.pyd') or dl.endswith('.dll'):
+                        parts[-1] = bdist_egg.strip_module(parts[-1])
                         top_level[os.path.splitext(parts[0])[0]] = 1
                         native_libs.append(src)
                     elif dl.endswith('.py') and old!='SCRIPTS/':
         for res in native_libs:
             if res.lower().endswith('.pyd'):    # create stubs for .pyd's
                 parts = res.split('/')
-                resource, parts[-1] = parts[-1], parts[-1][:-1]
+                resource = parts[-1]
+                parts[-1] = bdist_egg.strip_module(parts[-1])+'.py'
                 pyfile = os.path.join(egg_tmp, *parts)
                 to_compile.append(pyfile); stubs.append(pyfile)
                 bdist_egg.write_stub(resource, pyfile)
-
         self.byte_compile(to_compile)   # compile .py's
         bdist_egg.write_safety_flag(os.path.join(egg_tmp,'EGG-INFO'),
             bdist_egg.analyze_egg(egg_tmp, stubs))  # write zip-safety flag

File setuptools/dist.py

 
         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:
 
 
 
-
-
 class Feature:
     """A subset of the distribution that can be excluded if unneeded/wanted