Merge changes from distribute 0.6.41

1 files changed, 16 insertions, 23 deletions

diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py
index df6107d7..c98be5a2 100755
--- a/setuptools/command/easy_install.py
+++ b/setuptools/command/easy_install.py
@@ -7,7 +7,7 @@ A tool for doing automatic download/extract/build of distutils-based Python
 packages.  For detailed documentation, see the accompanying EasyInstall.txt
 file, or visit the `EasyInstall home page`__.
 
-__ http://packages.python.org/distribute/easy_install.html
+__ http://packages.python.org/setuptools/easy_install.html
 
 """
 import sys
@@ -202,7 +202,7 @@ class easy_install(Command):
 
     def finalize_options(self):
         if self.version:
-            print 'distribute %s' % get_distribution('distribute').version
+            print 'setuptools %s' % get_distribution('setuptools').version
             sys.exit()
 
         py_version = sys.version.split()[0]
@@ -283,7 +283,7 @@ class easy_install(Command):
                 else:
                     self.all_site_dirs.append(normalize_path(d))
         if not self.editable: self.check_site_dir()
-        self.index_url = self.index_url or "http://pypi.python.org/simple"
+        self.index_url = self.index_url or "https://pypi.python.org/simple"
         self.shadow_path = self.all_site_dirs[:]
         for path_item in self.install_dir, normalize_path(self.script_dir):
             if path_item not in self.shadow_path:
@@ -402,7 +402,7 @@ class easy_install(Command):
         # Is it a configured, PYTHONPATH, implicit, or explicit site dir?
         is_site_dir = instdir in self.all_site_dirs
 
-        if not is_site_dir:
+        if not is_site_dir and not self.multi_version:
             # No?  Then directly test whether it does .pth file processing
             is_site_dir = self.check_pth_processing()
         else:
@@ -467,7 +467,7 @@ variable.
 For information on other options, you may wish to consult the
 documentation at:
 
-  http://packages.python.org/distribute/easy_install.html
+  http://packages.python.org/setuptools/easy_install.html
 
 Please make the appropriate changes for your system and try again.
 """
@@ -590,7 +590,6 @@ Please make the appropriate changes for your system and try again.
                 spec, tmpdir, self.upgrade, self.editable, not self.always_copy,
                 self.local_index
             )
-
             if dist is None:
                 msg = "Could not find suitable distribution for %r" % spec
                 if self.always_copy:
@@ -661,8 +660,7 @@ Please make the appropriate changes for your system and try again.
         self.update_pth(dist)
         self.package_index.add(dist)
         self.local_index.add(dist)
-        if not self.editable:
-            self.install_egg_scripts(dist)
+        self.install_egg_scripts(dist)
         self.installed_projects[dist.key] = dist
         log.info(self.installation_report(requirement, dist, *info))
         if (dist.has_metadata('dependency_links.txt') and
@@ -710,7 +708,7 @@ Please make the appropriate changes for your system and try again.
             return True
         if not dist.has_metadata('zip-safe'):
             return True
-        return True
+        return False
 
     def maybe_move(self, spec, dist_filename, setup_base):
         dst = os.path.join(self.build_directory, spec.key)
@@ -896,7 +894,7 @@ Please make the appropriate changes for your system and try again.
             f = open(pkg_inf,'w')
             f.write('Metadata-Version: 1.0\n')
             for k,v in cfg.items('metadata'):
-                if k<>'target_version':
+                if k!='target_version':
                     f.write('%s: %s\n' % (k.replace('_','-').title(), v))
             f.close()
         script_dir = os.path.join(egg_info,'scripts')
@@ -1170,7 +1168,8 @@ See the setuptools documentation for the "develop" command for more info.
         if not self.dry_run:
 
             self.pth_file.save()
-            if dist.key=='distribute':
+
+            if dist.key=='setuptools':
                 # Ensure that setuptools itself never becomes unavailable!
                 # XXX should this check for latest version?
                 filename = os.path.join(self.install_dir,'setuptools.pth')
@@ -1190,7 +1189,6 @@ See the setuptools documentation for the "develop" command for more info.
         def pf(src,dst):
             if dst.endswith('.py') and not src.startswith('EGG-INFO/'):
                 to_compile.append(dst)
-                to_chmod.append(dst)
             elif dst.endswith('.dll') or dst.endswith('.so'):
                 to_chmod.append(dst)
             self.unpack_progress(src,dst)
@@ -1229,6 +1227,7 @@ See the setuptools documentation for the "develop" command for more info.
 
 
 
+
     def no_default_version_msg(self):
         return """bad install directory or PYTHONPATH
 
@@ -1255,7 +1254,7 @@ Here are some of your options for correcting the problem:
 * You can set up the installation directory to support ".pth" files by
   using one of the approaches described here:
 
-  http://packages.python.org/distribute/easy_install.html#custom-installation-locations
+  http://packages.python.org/setuptools/easy_install.html#custom-installation-locations
 
 Please make the appropriate changes for your system and try again.""" % (
         self.install_dir, os.environ.get('PYTHONPATH','')
@@ -1277,7 +1276,7 @@ Please make the appropriate changes for your system and try again.""" % (
             return  # already did it, or don't need to
 
         sitepy = os.path.join(self.install_dir, "site.py")
-        source = resource_string(Requirement.parse("distribute"), "site.py")
+        source = resource_string(Requirement.parse("setuptools"), "site.py")
         current = ""
 
         if os.path.exists(sitepy):
@@ -1512,7 +1511,7 @@ def get_exe_prefixes(exe_filename):
         ('PURELIB/', ''), ('PLATLIB/pywin32_system32', ''),
         ('PLATLIB/', ''),
         ('SCRIPTS/', 'EGG-INFO/scripts/'),
-        ('DATA/LIB/site-packages', ''),
+        ('DATA/lib/site-packages', ''),
     ]
     z = zipfile.ZipFile(exe_filename)
     try:
@@ -1523,7 +1522,7 @@ def get_exe_prefixes(exe_filename):
                 if parts[1].endswith('.egg-info'):
                     prefixes.insert(0,('/'.join(parts[:2]), 'EGG-INFO/'))
                     break
-            if len(parts)<>2 or not name.endswith('.pth'):
+            if len(parts)!=2 or not name.endswith('.pth'):
                 continue
             if name.endswith('-nspkg.pth'):
                 continue
@@ -1842,7 +1841,7 @@ def get_script_args(dist, executable=sys_executable, wininst=False):
                     ext = '-script.py'
                     old = ['.py','.pyc','.pyo']
                     new_header = re.sub('(?i)pythonw.exe','python.exe',header)
-                if os.path.exists(new_header[2:-1]) or sys.platform!='win32':
+                if os.path.exists(new_header[2:-1].strip('"')) or sys.platform!='win32':
                     hdr = new_header
                 else:
                     hdr = header
@@ -1961,12 +1960,6 @@ usage: %(script)s [options] requirement_or_url ...
         def _show_help(self,*args,**kw):
             with_ei_usage(lambda: Distribution._show_help(self,*args,**kw))
 
-        def find_config_files(self):
-            files = Distribution.find_config_files(self)
-            if 'setup.cfg' in files:
-                files.remove('setup.cfg')
-            return files
-
     if argv is None:
         argv = sys.argv[1:]