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 @@ def _initialize(g):
# 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 @@ def reinitialize_command(self, command, reinit_subcommands=0, **kw):
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 visit (z, dirname, names):
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 @@ def _make_spec_file(self):
] ]
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 @@ def link_shared_object(self, objects, output_libname, output_dir=None,
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 @@ def assert_relative(path):
setup.py directory, *never* absolute paths. setup.py directory, *never* absolute paths.
""" % path """ % path
) )

View File

@ -114,10 +114,3 @@ def install_egg_scripts(self, dist):
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 @@ def _show_help(self,*args,**kw):
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 @@ def do_egg_install(self):
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 @@ def install_namespaces(self):
% locals() % locals()
) )
f.close() f.close()

View File

@ -74,9 +74,3 @@ def get_outputs(self):
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 @@ def write_script(self, script_name, contents, mode="t", *ignored):
os.chmod(target,0755) os.chmod(target,0755)
except (AttributeError, os.error): except (AttributeError, os.error):
pass pass

View File

@ -55,28 +55,3 @@ def run(self):
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 @@ def run(self):
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 @@ def read_template(self):
# 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 @@ def run(self):
}, },
self.dry_run self.dry_run
) )

View File

@ -117,7 +117,3 @@ def run_tests(self):
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 @@ def validate(self,dist):
" 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 @@ class Library(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 @@ def __str__(self):
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 @@ def testNoSuite(self):
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 @@ def c(s1,s2):
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)