Whilespace normalization (reindint.py).

This commit is contained in:
Tim Peters 2006-04-18 17:32:12 +00:00
parent 17a35f906c
commit 584b0e0c3d
31 changed files with 53 additions and 314 deletions

View file

@ -3,4 +3,3 @@
if __name__ == '__main__': if __name__ == '__main__':
from setuptools.command.easy_install import main from setuptools.command.easy_install import main
main() main()

View file

@ -2375,4 +2375,3 @@ run_main = run_script # backward compatibility
# calling ``require()``) will get activated as well. # calling ``require()``) will get activated as well.
add_activation_listener(lambda dist: dist.activate()) add_activation_listener(lambda dist: dist.activate())
working_set.entries=[]; map(working_set.add_entry,sys.path) # match order working_set.entries=[]; map(working_set.add_entry,sys.path) # match order

View file

@ -62,21 +62,3 @@ class Command(_Command):
import distutils.core import distutils.core
distutils.core.Command = Command # we can't patch distutils.cmd, alas distutils.core.Command = Command # we can't patch distutils.cmd, alas

View file

@ -198,8 +198,3 @@ def unpack_tarfile(filename, extract_dir, progress_filter=default_filter):
extraction_drivers = unpack_directory, unpack_zipfile, unpack_tarfile extraction_drivers = unpack_directory, unpack_zipfile, unpack_tarfile

View file

@ -77,6 +77,3 @@ def format_alias(name, aliases):
else: else:
source = '--filename=%r' % source source = '--filename=%r' % source
return source+name+' '+command return source+name+' '+command

View file

@ -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) os.path.walk(base_dir, visit, None)
return zip_filename return zip_filename

View file

@ -35,34 +35,3 @@ class bdist_rpm(_bdist_rpm):
] ]
spec.insert(spec.index(line24)+1, "%define unmangled_version "+version) spec.insert(spec.index(line24)+1, "%define unmangled_version "+version)
return spec return spec

View file

@ -283,5 +283,3 @@ else:
self.create_static_lib( self.create_static_lib(
objects, basename, output_dir, debug, target_lang objects, basename, output_dir, debug, target_lang
) )

View file

@ -190,16 +190,3 @@ setup() arguments must *always* be /-separated paths relative to the
setup.py directory, *never* absolute paths. setup.py directory, *never* absolute paths.
""" % path """ % path
) )

View file

@ -114,10 +114,3 @@ class develop(easy_install):
script_text = f.read() script_text = f.read()
f.close() f.close()
self.install_script(dist, script_name, script_text, script_path) self.install_script(dist, script_name, script_text, script_path)

View file

@ -1553,8 +1553,3 @@ usage: %(script)s [options] requirement_or_url ...
distclass=DistributionWithoutHelpCommands, **kw distclass=DistributionWithoutHelpCommands, **kw
) )
) )

View file

@ -363,7 +363,3 @@ def get_pkg_info_revision():
if match: if match:
return int(match.group(1)) return int(match.group(1))
return 0 return 0

View file

@ -99,25 +99,3 @@ class install(_install):
cmd.args = args cmd.args = args
cmd.run() cmd.run()
setuptools.bootstrap_install_from = None setuptools.bootstrap_install_from = None

View file

@ -79,4 +79,3 @@ class install_egg_info(Command):
% locals() % locals()
) )
f.close() f.close()

View file

@ -74,9 +74,3 @@ class install_lib(_install_lib):
if exclude: if exclude:
return [f for f in outputs if f not in exclude] return [f for f in outputs if f not in exclude]
return outputs return outputs

View file

@ -54,29 +54,3 @@ class install_scripts(_install_scripts):
os.chmod(target,0755) os.chmod(target,0755)
except (AttributeError, os.error): except (AttributeError, os.error):
pass pass

View file

@ -55,28 +55,3 @@ class rotate(Command):
log.info("Deleting %s", f) log.info("Deleting %s", f)
if not self.dry_run: if not self.dry_run:
os.unlink(f) os.unlink(f)

View file

@ -22,4 +22,3 @@ class saveopts(option_base):
settings.setdefault(cmd,{})[opt] = val settings.setdefault(cmd,{})[opt] = val
edit_config(self.filename, settings, self.dry_run) edit_config(self.filename, settings, self.dry_run)

View file

@ -161,4 +161,3 @@ class sdist(_sdist):
# dying and thus masking the real error # dying and thus masking the real error
sys.exc_info()[2].tb_next.tb_frame.f_locals['template'].close() sys.exc_info()[2].tb_next.tb_frame.f_locals['template'].close()
raise raise

View file

@ -156,9 +156,3 @@ class setopt(option_base):
}, },
self.dry_run self.dry_run
) )

View file

@ -117,7 +117,3 @@ class test(Command):
None, None, [unittest.__file__]+self.test_args, None, None, [unittest.__file__]+self.test_args,
testLoader = loader_class() testLoader = loader_class()
) )

View file

@ -237,10 +237,3 @@ def extract_constant(code,symbol,default=-1):
return const return const
else: else:
const = default const = default

View file

@ -796,25 +796,3 @@ class Feature:
" doesn't contain any packages or modules under %s" " doesn't contain any packages or modules under %s"
% (self.description, item, item) % (self.description, item, item)
) )

View file

@ -33,4 +33,3 @@ distutils.core.Extension = Extension
distutils.extension.Extension = Extension distutils.extension.Extension = Extension
if 'distutils.command.build_ext' in sys.modules: if 'distutils.command.build_ext' in sys.modules:
sys.modules['distutils.command.build_ext'].Extension = Extension sys.modules['distutils.command.build_ext'].Extension = Extension

View file

@ -672,26 +672,3 @@ def get_sf_ip():
# DNS-bl0ck1n9 f1r3w4llz sUx0rs! # DNS-bl0ck1n9 f1r3w4llz sUx0rs!
_sf_mirrors[:] = ['dl.sourceforge.net'] _sf_mirrors[:] = ['dl.sourceforge.net']
return random.choice(_sf_mirrors) return random.choice(_sf_mirrors)

View file

@ -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 support alternate installation locations even if you run its setup
script by hand. Please inform the package's author and the EasyInstall 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 maintainers to find out if a fix or workaround is available.""" % self.args

View file

@ -72,11 +72,3 @@ def __boot():
if __name__=='site': if __name__=='site':
__boot() __boot()
del __boot del __boot

View file

@ -362,8 +362,3 @@ class TestCommandTests(TestCase):
ts5 = makeSetup().get_command_obj('test') ts5 = makeSetup().get_command_obj('test')
ts5.ensure_finalized() ts5.ensure_finalized()
self.assertEqual(ts5.test_suite, None) self.assertEqual(ts5.test_suite, None)

View file

@ -481,12 +481,3 @@ class ParseTests(TestCase):
for p,v1 in enumerate(torture): for p,v1 in enumerate(torture):
for v2 in torture[p+1:]: for v2 in torture[p+1:]:
c(v2,v1) c(v2,v1)