From 584b0e0c3d27dc6b576366368bf7ca2f60e69e7c Mon Sep 17 00:00:00 2001 From: Tim Peters Date: Tue, 18 Apr 2006 17:32:12 +0000 Subject: [PATCH] Whilespace normalization (reindint.py). --- Lib/easy_install.py | 1 - Lib/pkg_resources.py | 13 ++++----- Lib/pkgutil.py | 8 +++--- Lib/setuptools/__init__.py | 22 ++------------- Lib/setuptools/archive_util.py | 9 ++---- Lib/setuptools/command/__init__.py | 2 +- Lib/setuptools/command/alias.py | 9 ++---- Lib/setuptools/command/bdist_egg.py | 10 +++---- Lib/setuptools/command/bdist_rpm.py | 31 --------------------- Lib/setuptools/command/build_ext.py | 2 -- Lib/setuptools/command/build_py.py | 19 ++----------- Lib/setuptools/command/develop.py | 11 ++------ Lib/setuptools/command/easy_install.py | 9 ++---- Lib/setuptools/command/egg_info.py | 4 --- Lib/setuptools/command/install.py | 26 ++---------------- Lib/setuptools/command/install_egg_info.py | 7 ++--- Lib/setuptools/command/install_lib.py | 6 ---- Lib/setuptools/command/install_scripts.py | 32 ++-------------------- Lib/setuptools/command/rotate.py | 27 +----------------- Lib/setuptools/command/saveopts.py | 1 - Lib/setuptools/command/sdist.py | 3 +- Lib/setuptools/command/setopt.py | 14 +++------- Lib/setuptools/command/test.py | 6 +--- Lib/setuptools/depends.py | 7 ----- Lib/setuptools/dist.py | 22 --------------- Lib/setuptools/extension.py | 3 +- Lib/setuptools/package_index.py | 27 ++---------------- Lib/setuptools/sandbox.py | 2 -- Lib/setuptools/site-patch.py | 16 +++-------- Lib/setuptools/tests/__init__.py | 5 ---- Lib/setuptools/tests/test_resources.py | 13 ++------- 31 files changed, 53 insertions(+), 314 deletions(-) diff --git a/Lib/easy_install.py b/Lib/easy_install.py index b8b841259e..d87e984034 100644 --- a/Lib/easy_install.py +++ b/Lib/easy_install.py @@ -3,4 +3,3 @@ if __name__ == '__main__': from setuptools.command.easy_install import main main() - diff --git a/Lib/pkg_resources.py b/Lib/pkg_resources.py index 9db11d8445..db6cc90259 100644 --- a/Lib/pkg_resources.py +++ b/Lib/pkg_resources.py @@ -58,7 +58,7 @@ __all__ = [ # Exceptions 'ResolutionError','VersionConflict','DistributionNotFound','UnknownExtra', 'ExtractionError', - + # Parsing functions and string utilities 'parse_requirements', 'parse_version', 'safe_name', 'safe_version', 'get_platform', 'compatible_platforms', 'yield_lines', 'split_sections', @@ -823,7 +823,7 @@ class ResourceManager: old_exc = sys.exc_info()[1] cache_path = self.extraction_path or get_default_cache() - + err = ExtractionError("""Can't extract file(s) to egg cache The following error occurred while trying to extract file(s) to the Python egg @@ -878,7 +878,7 @@ variable to point to an accessible directory. ensure_directory(target_path) except: self.extraction_error() - + self.cached_files[target_path] = 1 return target_path @@ -1264,11 +1264,11 @@ class ZipProvider(EggProvider): try: rename(tmpnam, real_path) - - except os.error: + + except os.error: if os.path.isfile(real_path): stat = os.stat(real_path) - + if stat.st_size==size and stat.st_mtime==timestamp: # size and stamp match, somebody did it just ahead of # us, so we're done @@ -2375,4 +2375,3 @@ run_main = run_script # backward compatibility # calling ``require()``) will get activated as well. add_activation_listener(lambda dist: dist.activate()) working_set.entries=[]; map(working_set.add_entry,sys.path) # match order - diff --git a/Lib/pkgutil.py b/Lib/pkgutil.py index 24de5d19e8..731689273d 100644 --- a/Lib/pkgutil.py +++ b/Lib/pkgutil.py @@ -44,7 +44,7 @@ def simplegeneric(func): class cls(cls,object): pass mro = cls.__mro__[1:] except TypeError: - mro = object, # must be an ExtensionClass or some such :( + mro = object, # must be an ExtensionClass or some such :( for t in mro: if t in registry: return registry[t](*args,**kw) @@ -64,7 +64,7 @@ def simplegeneric(func): wrapper.__dict__ = func.__dict__ wrapper.__doc__ = func.__doc__ wrapper.register = register - return wrapper + return wrapper def walk_packages(path=None, prefix='', onerror=None): @@ -160,7 +160,7 @@ class ImpImporter: modname = inspect.getmodulename(fn) if modname=='__init__' or modname in yielded: continue - + path = os.path.join(self.path, fn) ispkg = False @@ -276,7 +276,7 @@ class ImpLoader: try: import zipimport from zipimport import zipimporter - + def iter_zipimport_modules(importer, prefix=''): dirlist = zipimport._zip_directory_cache[importer.archive].keys() dirlist.sort() diff --git a/Lib/setuptools/__init__.py b/Lib/setuptools/__init__.py index 57e364e0e5..3921ce2ee9 100644 --- a/Lib/setuptools/__init__.py +++ b/Lib/setuptools/__init__.py @@ -40,7 +40,7 @@ def find_packages(where='.', exclude=()): return out setup = distutils.core.setup - + _Command = _get_unpatched(_Command) class Command(_Command): @@ -53,7 +53,7 @@ class Command(_Command): _Command.__init__(self,dist) for k,v in kw.items(): setattr(self,k,v) - + def reinitialize_command(self, command, reinit_subcommands=0, **kw): cmd = _Command.reinitialize_command(self, command, reinit_subcommands) for k,v in kw.items(): @@ -62,21 +62,3 @@ class Command(_Command): import distutils.core distutils.core.Command = Command # we can't patch distutils.cmd, alas - - - - - - - - - - - - - - - - - - diff --git a/Lib/setuptools/archive_util.py b/Lib/setuptools/archive_util.py index 511f05ad5d..dd9c684d14 100755 --- a/Lib/setuptools/archive_util.py +++ b/Lib/setuptools/archive_util.py @@ -14,7 +14,7 @@ class UnrecognizedFormat(DistutilsError): """Couldn't recognize the archive type""" def default_filter(src,dst): - """The default progress/filter callback; returns True for all files""" + """The default progress/filter callback; returns True for all files""" return dst @@ -184,7 +184,7 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter): name = member.name # don't extract absolute paths or ones with .. in them if not name.startswith('/') and '..' not in name: - dst = os.path.join(extract_dir, *name.split('/')) + dst = os.path.join(extract_dir, *name.split('/')) dst = progress_filter(name, dst) if dst: if dst.endswith(os.sep): @@ -198,8 +198,3 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter): extraction_drivers = unpack_directory, unpack_zipfile, unpack_tarfile - - - - - diff --git a/Lib/setuptools/command/__init__.py b/Lib/setuptools/command/__init__.py index 03bb9dd5b3..bff53e744d 100644 --- a/Lib/setuptools/command/__init__.py +++ b/Lib/setuptools/command/__init__.py @@ -8,7 +8,7 @@ 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 diff --git a/Lib/setuptools/command/alias.py b/Lib/setuptools/command/alias.py index f5368b29e9..1df474a34b 100755 --- a/Lib/setuptools/command/alias.py +++ b/Lib/setuptools/command/alias.py @@ -11,17 +11,17 @@ def shquote(arg): if c in arg: return repr(arg) if arg.split()<>[arg]: return repr(arg) - return arg + return arg class alias(option_base): """Define a shortcut that invokes one or more commands""" - + description = "define a shortcut to invoke one or more commands" command_consumes_arguments = True user_options = [ - ('remove', 'r', 'remove (unset) the alias'), + ('remove', 'r', 'remove (unset) the alias'), ] + option_base.user_options boolean_options = option_base.boolean_options + ['remove'] @@ -77,6 +77,3 @@ def format_alias(name, aliases): else: source = '--filename=%r' % source return source+name+' '+command - - - diff --git a/Lib/setuptools/command/bdist_egg.py b/Lib/setuptools/command/bdist_egg.py index 74f2d426b2..617d88d139 100644 --- a/Lib/setuptools/command/bdist_egg.py +++ b/Lib/setuptools/command/bdist_egg.py @@ -233,7 +233,7 @@ class bdist_egg(Command): if self.exclude_source_files: self.zap_pyfiles() - + # Make the archive make_zipfile(self.egg_output, archive_root, verbose=self.verbose, dry_run=self.dry_run) @@ -262,7 +262,7 @@ class bdist_egg(Command): def make_init_files(self): """Create missing package __init__ files""" - init_files = [] + init_files = [] for base,dirs,files in walk_egg(self.bdist_dir): if base==self.bdist_dir: # don't put an __init__ in the root @@ -276,7 +276,7 @@ class bdist_egg(Command): filename = os.path.join(base,'__init__.py') if not self.dry_run: f = open(filename,'w'); f.write(NS_PKG_STUB) - f.close() + f.close() init_files.append(filename) break else: @@ -329,7 +329,7 @@ NATIVE_EXTENSIONS = dict.fromkeys('.dll .so .dylib .pyd'.split()) def walk_egg(egg_dir): """Walk an unpacked egg's contents, skipping the metadata directory""" walker = os.walk(egg_dir) - base,dirs,files = walker.next() + base,dirs,files = walker.next() if 'EGG-INFO' in dirs: dirs.remove('EGG-INFO') yield base,dirs,files @@ -447,5 +447,3 @@ def make_zipfile (zip_filename, base_dir, verbose=0, dry_run=0, compress=None): os.path.walk(base_dir, visit, None) return zip_filename - - diff --git a/Lib/setuptools/command/bdist_rpm.py b/Lib/setuptools/command/bdist_rpm.py index 1a0b04843b..00e07acc37 100755 --- a/Lib/setuptools/command/bdist_rpm.py +++ b/Lib/setuptools/command/bdist_rpm.py @@ -35,34 +35,3 @@ class bdist_rpm(_bdist_rpm): ] spec.insert(spec.index(line24)+1, "%define unmangled_version "+version) return spec - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Lib/setuptools/command/build_ext.py b/Lib/setuptools/command/build_ext.py index a4b9047e45..f8551fb49f 100644 --- a/Lib/setuptools/command/build_ext.py +++ b/Lib/setuptools/command/build_ext.py @@ -283,5 +283,3 @@ else: self.create_static_lib( objects, basename, output_dir, debug, target_lang ) - - diff --git a/Lib/setuptools/command/build_py.py b/Lib/setuptools/command/build_py.py index d820710e11..77a9b236c2 100644 --- a/Lib/setuptools/command/build_py.py +++ b/Lib/setuptools/command/build_py.py @@ -93,7 +93,7 @@ class build_py(_build_py): ei_cmd = self.get_finalized_command('egg_info') for path in ei_cmd.filelist.files: if path.endswith('.py'): - continue + continue d,f = os.path.split(assert_relative(path)) prev = None while d and d!=prev and d not in src_dirs: @@ -142,7 +142,7 @@ class build_py(_build_py): f = open(init_py,'rU') if 'declare_namespace' not in f.read(): - from distutils.errors import DistutilsError + from distutils.errors import DistutilsError raise DistutilsError( "Namespace package problem: %s is a namespace package, but its\n" "__init__.py does not call declare_namespace()! Please fix it.\n" @@ -167,7 +167,7 @@ class build_py(_build_py): globs = (self.exclude_package_data.get('', []) + self.exclude_package_data.get(package, [])) bad = [] - for pattern in globs: + for pattern in globs: bad.extend( fnmatch.filter( files, os.path.join(src_dir, convert_path(pattern)) @@ -190,16 +190,3 @@ setup() arguments must *always* be /-separated paths relative to the setup.py directory, *never* absolute paths. """ % path ) - - - - - - - - - - - - - diff --git a/Lib/setuptools/command/develop.py b/Lib/setuptools/command/develop.py index f38506bbda..7ab5b23838 100755 --- a/Lib/setuptools/command/develop.py +++ b/Lib/setuptools/command/develop.py @@ -46,7 +46,7 @@ class develop(easy_install): "Please rename %r to %r before using 'develop'" % (ei.egg_info, ei.broken_egg_info) ) - self.args = [ei.egg_name] + self.args = [ei.egg_name] easy_install.finalize_options(self) self.egg_link = os.path.join(self.install_dir, ei.egg_name+'.egg-link') self.egg_base = ei.egg_base @@ -104,7 +104,7 @@ class develop(easy_install): # create wrapper scripts in the script dir, pointing to dist.scripts # new-style... - self.install_wrapper_scripts(dist) + self.install_wrapper_scripts(dist) # ...and old-style for script_name in self.distribution.scripts or []: @@ -114,10 +114,3 @@ class develop(easy_install): script_text = f.read() f.close() self.install_script(dist, script_name, script_text, script_path) - - - - - - - diff --git a/Lib/setuptools/command/easy_install.py b/Lib/setuptools/command/easy_install.py index adb99b60a1..3ddcec441f 100755 --- a/Lib/setuptools/command/easy_install.py +++ b/Lib/setuptools/command/easy_install.py @@ -1357,7 +1357,7 @@ class PthDistributions(Environment): """Write changed .pth file back to disk""" if not self.dirty: return - + data = '\n'.join(map(self.make_relative,self.paths)) if data: log.debug("Saving %s", self.filename) @@ -1434,7 +1434,7 @@ def uncache_zipdir(path): del zdc[p] return - + def get_script_args(dist, executable=sys_executable): """Yield write_script() argument tuples for a distribution's entrypoints""" spec = str(dist.as_requirement()) @@ -1553,8 +1553,3 @@ usage: %(script)s [options] requirement_or_url ... distclass=DistributionWithoutHelpCommands, **kw ) ) - - - - - diff --git a/Lib/setuptools/command/egg_info.py b/Lib/setuptools/command/egg_info.py index d9fcd3f09a..b68fb39e12 100755 --- a/Lib/setuptools/command/egg_info.py +++ b/Lib/setuptools/command/egg_info.py @@ -363,7 +363,3 @@ def get_pkg_info_revision(): if match: return int(match.group(1)) return 0 - - - - diff --git a/Lib/setuptools/command/install.py b/Lib/setuptools/command/install.py index 7221b17103..bfb9af5aee 100644 --- a/Lib/setuptools/command/install.py +++ b/Lib/setuptools/command/install.py @@ -60,7 +60,7 @@ class install(_install): caller = sys._getframe(2) caller_module = caller.f_globals.get('__name__','') caller_name = caller.f_code.co_name - + if caller_module != 'distutils.dist' or caller_name!='run_commands': # We weren't called from the command line or setup(), so we # should run in backward-compatibility mode to support bdist_* @@ -68,7 +68,7 @@ class install(_install): _install.run(self) else: self.do_egg_install() - + @@ -99,25 +99,3 @@ class install(_install): cmd.args = args cmd.run() setuptools.bootstrap_install_from = None - - - - - - - - - - - - - - - - - - - - - - diff --git a/Lib/setuptools/command/install_egg_info.py b/Lib/setuptools/command/install_egg_info.py index 4c79f41bb4..193e91a0bb 100755 --- a/Lib/setuptools/command/install_egg_info.py +++ b/Lib/setuptools/command/install_egg_info.py @@ -22,7 +22,7 @@ class install_egg_info(Command): None, None, ei_cmd.egg_name, ei_cmd.egg_version ).egg_name()+'.egg-info' self.source = ei_cmd.egg_info - self.target = os.path.join(self.install_dir, basename) + self.target = os.path.join(self.install_dir, basename) self.outputs = [self.target] def run(self): @@ -43,7 +43,7 @@ class install_egg_info(Command): return self.outputs def copytree(self): - # Copy the .egg-info tree to site-packages + # Copy the .egg-info tree to site-packages def skimmer(src,dst): # filter out source-control directories; note that 'src' is always # a '/'-separated path, regardless of platform. 'dst' is a @@ -78,5 +78,4 @@ class install_egg_info(Command): "(p not in mp) and mp.append(p)\n" % locals() ) - f.close() - + f.close() diff --git a/Lib/setuptools/command/install_lib.py b/Lib/setuptools/command/install_lib.py index 82afa1421b..96c8dfeb51 100644 --- a/Lib/setuptools/command/install_lib.py +++ b/Lib/setuptools/command/install_lib.py @@ -74,9 +74,3 @@ class install_lib(_install_lib): if exclude: return [f for f in outputs if f not in exclude] return outputs - - - - - - diff --git a/Lib/setuptools/command/install_scripts.py b/Lib/setuptools/command/install_scripts.py index fc156dcea5..69558bf9a2 100755 --- a/Lib/setuptools/command/install_scripts.py +++ b/Lib/setuptools/command/install_scripts.py @@ -11,7 +11,7 @@ class install_scripts(_install_scripts): def initialize_options(self): _install_scripts.initialize_options(self) self.no_ep = False - + def run(self): self.run_command("egg_info") if self.distribution.scripts: @@ -20,9 +20,9 @@ class install_scripts(_install_scripts): self.outfiles = [] if self.no_ep: # don't install entry point scripts into .egg file! - return + return - ei_cmd = self.get_finalized_command("egg_info") + ei_cmd = self.get_finalized_command("egg_info") dist = Distribution( ei_cmd.egg_base, PathMetadata(ei_cmd.egg_base, ei_cmd.egg_info), ei_cmd.egg_name, ei_cmd.egg_version, @@ -54,29 +54,3 @@ class install_scripts(_install_scripts): os.chmod(target,0755) except (AttributeError, os.error): pass - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Lib/setuptools/command/rotate.py b/Lib/setuptools/command/rotate.py index 11b6eae82b..8aab312ce1 100755 --- a/Lib/setuptools/command/rotate.py +++ b/Lib/setuptools/command/rotate.py @@ -28,7 +28,7 @@ class rotate(Command): "(e.g. '.zip' or '.egg')" ) if self.keep is None: - raise DistutilsOptionError("Must specify number of files to keep") + raise DistutilsOptionError("Must specify number of files to keep") try: self.keep = int(self.keep) except ValueError: @@ -55,28 +55,3 @@ class rotate(Command): log.info("Deleting %s", f) if not self.dry_run: os.unlink(f) - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Lib/setuptools/command/saveopts.py b/Lib/setuptools/command/saveopts.py index 1180a440c9..9c58d72e44 100755 --- a/Lib/setuptools/command/saveopts.py +++ b/Lib/setuptools/command/saveopts.py @@ -22,4 +22,3 @@ class saveopts(option_base): settings.setdefault(cmd,{})[opt] = val edit_config(self.filename, settings, self.dry_run) - diff --git a/Lib/setuptools/command/sdist.py b/Lib/setuptools/command/sdist.py index 6026a7c2ed..829cd3c57e 100755 --- a/Lib/setuptools/command/sdist.py +++ b/Lib/setuptools/command/sdist.py @@ -144,7 +144,7 @@ class sdist(_sdist): self.filelist.append(os.path.join(ei_cmd.egg_info,'SOURCES.txt')) self.check_metadata() - self.make_distribution() + self.make_distribution() dist_files = getattr(self.distribution,'dist_files',[]) for file in self.archive_files: @@ -161,4 +161,3 @@ class sdist(_sdist): # dying and thus masking the real error sys.exc_info()[2].tb_next.tb_frame.f_locals['template'].close() raise - diff --git a/Lib/setuptools/command/setopt.py b/Lib/setuptools/command/setopt.py index dbf3a94ec1..e0c1058f38 100755 --- a/Lib/setuptools/command/setopt.py +++ b/Lib/setuptools/command/setopt.py @@ -82,7 +82,7 @@ def edit_config(filename, settings, dry_run=False): class option_base(Command): """Abstract base class for commands that mess with config files""" - + user_options = [ ('global-config', 'g', "save options to the site-wide distutils.cfg file"), @@ -94,7 +94,7 @@ class option_base(Command): boolean_options = [ 'global-config', 'user-config', - ] + ] def initialize_options(self): self.global_config = None @@ -116,7 +116,7 @@ class option_base(Command): "Must specify only one configuration file option", filenames ) - self.filename, = filenames + self.filename, = filenames @@ -130,7 +130,7 @@ class setopt(option_base): ('command=', 'c', 'command to set an option for'), ('option=', 'o', 'option to set'), ('set-value=', 's', 'value of the option'), - ('remove', 'r', 'remove (unset) the value'), + ('remove', 'r', 'remove (unset) the value'), ] + option_base.user_options boolean_options = option_base.boolean_options + ['remove'] @@ -156,9 +156,3 @@ class setopt(option_base): }, self.dry_run ) - - - - - - diff --git a/Lib/setuptools/command/test.py b/Lib/setuptools/command/test.py index 83589fa922..01fca35f09 100644 --- a/Lib/setuptools/command/test.py +++ b/Lib/setuptools/command/test.py @@ -88,7 +88,7 @@ class test(Command): self.reinitialize_command('build_ext', inplace=1) self.run_command('build_ext') - if self.distribution.tests_require: + if self.distribution.tests_require: self.distribution.fetch_build_eggs(self.distribution.tests_require) if self.test_suite: @@ -117,7 +117,3 @@ class test(Command): None, None, [unittest.__file__]+self.test_args, testLoader = loader_class() ) - - - - diff --git a/Lib/setuptools/depends.py b/Lib/setuptools/depends.py index 20e5cecbb3..68d81945ef 100644 --- a/Lib/setuptools/depends.py +++ b/Lib/setuptools/depends.py @@ -237,10 +237,3 @@ def extract_constant(code,symbol,default=-1): return const else: const = default - - - - - - - diff --git a/Lib/setuptools/dist.py b/Lib/setuptools/dist.py index 8cdcc26f5f..f0417c1d1a 100644 --- a/Lib/setuptools/dist.py +++ b/Lib/setuptools/dist.py @@ -796,25 +796,3 @@ class Feature: " doesn't contain any packages or modules under %s" % (self.description, item, item) ) - - - - - - - - - - - - - - - - - - - - - - diff --git a/Lib/setuptools/extension.py b/Lib/setuptools/extension.py index 2bef84e523..cfcf55bf1a 100644 --- a/Lib/setuptools/extension.py +++ b/Lib/setuptools/extension.py @@ -14,7 +14,7 @@ class Extension(_Extension): """Extension that uses '.c' files in place of '.pyx' files""" if not have_pyrex: - # convert .pyx extensions to .c + # convert .pyx extensions to .c def __init__(self,*args,**kw): _Extension.__init__(self,*args,**kw) sources = [] @@ -33,4 +33,3 @@ distutils.core.Extension = Extension distutils.extension.Extension = Extension if 'distutils.command.build_ext' in sys.modules: sys.modules['distutils.command.build_ext'].Extension = Extension - diff --git a/Lib/setuptools/package_index.py b/Lib/setuptools/package_index.py index 3d66a7c52b..107e222b82 100755 --- a/Lib/setuptools/package_index.py +++ b/Lib/setuptools/package_index.py @@ -260,7 +260,7 @@ class PackageIndex(Environment): def find_packages(self, requirement): self.scan_url(self.index_url + requirement.unsafe_name+'/') - + if not self.package_pages.get(requirement.key): # Fall back to safe version of the name self.scan_url(self.index_url + requirement.project_name+'/') @@ -489,7 +489,7 @@ class PackageIndex(Environment): "Can't process plain .py files without an '#egg=name-version'" " suffix to enable automatic setup script generation." ) - + dl_blocksize = 8192 def _download_to(self, url, filename): self.url_ok(url,True) # raises error if not allowed @@ -672,26 +672,3 @@ def get_sf_ip(): # DNS-bl0ck1n9 f1r3w4llz sUx0rs! _sf_mirrors[:] = ['dl.sourceforge.net'] return random.choice(_sf_mirrors) - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Lib/setuptools/sandbox.py b/Lib/setuptools/sandbox.py index dbc24edea3..606944bd29 100755 --- a/Lib/setuptools/sandbox.py +++ b/Lib/setuptools/sandbox.py @@ -201,5 +201,3 @@ This package cannot be safely installed by EasyInstall, and may not support alternate installation locations even if you run its setup script by hand. Please inform the package's author and the EasyInstall maintainers to find out if a fix or workaround is available.""" % self.args - - diff --git a/Lib/setuptools/site-patch.py b/Lib/setuptools/site-patch.py index 80e084b257..b1b27b9fbd 100755 --- a/Lib/setuptools/site-patch.py +++ b/Lib/setuptools/site-patch.py @@ -1,5 +1,5 @@ def __boot(): - import sys, imp, os, os.path + import sys, imp, os, os.path PYTHONPATH = os.environ.get('PYTHONPATH') if PYTHONPATH is None or (sys.platform=='win32' and not PYTHONPATH): PYTHONPATH = [] @@ -48,7 +48,7 @@ def __boot(): addsitedir(item) sys.__egginsert += oldpos # restore effective old position - + d,nd = makepath(stdpath[0]) insert_at = None new_path = [] @@ -66,17 +66,9 @@ def __boot(): # new path after the insert point, back-insert it new_path.insert(insert_at, item) insert_at += 1 - + sys.path[:] = new_path -if __name__=='site': +if __name__=='site': __boot() del __boot - - - - - - - - diff --git a/Lib/setuptools/tests/__init__.py b/Lib/setuptools/tests/__init__.py index 9705bb5d84..8a767dcf95 100644 --- a/Lib/setuptools/tests/__init__.py +++ b/Lib/setuptools/tests/__init__.py @@ -362,8 +362,3 @@ class TestCommandTests(TestCase): ts5 = makeSetup().get_command_obj('test') ts5.ensure_finalized() self.assertEqual(ts5.test_suite, None) - - - - - diff --git a/Lib/setuptools/tests/test_resources.py b/Lib/setuptools/tests/test_resources.py index b4dbfdbd29..f32c72e3a8 100644 --- a/Lib/setuptools/tests/test_resources.py +++ b/Lib/setuptools/tests/test_resources.py @@ -143,7 +143,7 @@ class DistroTests(TestCase): self.assertRaises(VersionConflict, ws.resolve, parse_requirements("Foo==0.9"), ad) ws = WorkingSet([]) # reset - + # Request an extra that causes an unresolved dependency for "Baz" self.assertRaises( DistributionNotFound, ws.resolve,parse_requirements("Foo[bar]"), ad @@ -161,7 +161,7 @@ class DistroTests(TestCase): self.assertRaises( VersionConflict, ws.resolve, parse_requirements("Foo==1.2\nFoo!=1.2"), ad ) - + def testDistroDependsOptions(self): d = self.distRequires(""" Twisted>=1.5 @@ -481,12 +481,3 @@ class ParseTests(TestCase): for p,v1 in enumerate(torture): for v2 in torture[p+1:]: c(v2,v1) - - - - - - - - - -- 2.50.1