arfrever    09/11/15 03:23:50

  Added:                distribute-0.6.8-fix_tests.patch
  Log:
  Fix tests with Python 3.1.
  (Portage version: 14821-svn/cvs/Linux x86_64)

Revision  Changes    Path
1.1                  dev-python/setuptools/files/distribute-0.6.8-fix_tests.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/setuptools/files/distribute-0.6.8-fix_tests.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-python/setuptools/files/distribute-0.6.8-fix_tests.patch?rev=1.1&content-type=text/plain

Index: distribute-0.6.8-fix_tests.patch
===================================================================
https://bitbucket.org/tarek/distribute/issue/80/
https://bitbucket.org/tarek/distribute/changeset/e2de9f1e9064/

--- setuptools/command/__init__.py
+++ setuptools/command/__init__.py
@@ -5,13 +5,16 @@
     'register', 'bdist_wininst', 'upload_docs',
 ]
 
+from setuptools.command.install_scripts import install_scripts
 import sys
+
 if sys.version>='2.5':
     # In Python 2.5 and above, distutils includes its own upload command
     __all__.remove('upload')
 
 from distutils.command.bdist import bdist
 
+
 if 'egg' not in bdist.format_commands:
     bdist.format_command['egg'] = ('bdist_egg', "Python .egg file")
     bdist.format_commands.append('egg')
--- setuptools/command/install_scripts.py
+++ setuptools/command/install_scripts.py
@@ -1,6 +1,5 @@
 from distutils.command.install_scripts import install_scripts \
      as _install_scripts
-from easy_install import get_script_args, sys_executable, chmod
 from pkg_resources import Distribution, PathMetadata, ensure_directory
 import os
 from distutils import log
@@ -13,6 +12,9 @@
         self.no_ep = False
 
     def run(self):
+        from setuptools.command.easy_install import (get_script_args,
+                                                     sys_executable)
+
         self.run_command("egg_info")
         if self.distribution.scripts:
             _install_scripts.run(self)  # run first to set up self.outfiles
@@ -37,6 +39,7 @@
 
     def write_script(self, script_name, contents, mode="t", *ignored):
         """Write an executable file to the scripts directory"""
+        from setuptools.command.easy_install import chmod
         log.info("Installing %s script to %s", script_name, self.install_dir)
         target = os.path.join(self.install_dir, script_name)
         self.outfiles.append(target)