summaryrefslogtreecommitdiffstats
path: root/Lib
diff options
context:
space:
mode:
authorTarek Ziadé <ziade.tarek@gmail.com>2009-04-13 20:19:58 (GMT)
committerTarek Ziadé <ziade.tarek@gmail.com>2009-04-13 20:19:58 (GMT)
commit3a794c4add0326a185c33ba91fcf51b341a82ad3 (patch)
treef83122b86f85be1b3389a594d0c7b4a5db6763b3 /Lib
parentc44865a345364573a68a14fe546b34b54ed2b3de (diff)
downloadcpython-3a794c4add0326a185c33ba91fcf51b341a82ad3.zip
cpython-3a794c4add0326a185c33ba91fcf51b341a82ad3.tar.gz
cpython-3a794c4add0326a185c33ba91fcf51b341a82ad3.tar.bz2
Merged revisions 71589 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk ........ r71589 | tarek.ziade | 2009-04-13 22:14:54 +0200 (Mon, 13 Apr 2009) | 1 line pep8-fied ........
Diffstat (limited to 'Lib')
-rw-r--r--Lib/distutils/cmd.py16
1 files changed, 6 insertions, 10 deletions
diff --git a/Lib/distutils/cmd.py b/Lib/distutils/cmd.py
index 5829a56..aff7d68 100644
--- a/Lib/distutils/cmd.py
+++ b/Lib/distutils/cmd.py
@@ -93,9 +93,8 @@ class Command:
# always calls 'finalize_options()', to respect/update it.
self.finalized = 0
-
# XXX A more explicit way to customize dry_run would be better.
- def __getattr__ (self, attr):
+ def __getattr__(self, attr):
if attr == 'dry_run':
myval = getattr(self, "_" + attr)
if myval is None:
@@ -105,7 +104,7 @@ class Command:
else:
raise AttributeError(attr)
- def ensure_finalized (self):
+ def ensure_finalized(self):
if not self.finalized:
self.finalize_options()
self.finalized = 1
@@ -175,7 +174,6 @@ class Command:
This method must be implemented by all command classes.
"""
-
raise RuntimeError("abstract method -- subclass %s must override"
% self.__class__)
@@ -351,7 +349,7 @@ class Command:
preserve_times, not self.force, link,
dry_run=self.dry_run)
- def copy_tree (self, infile, outfile, preserve_mode=1, preserve_times=1,
+ def copy_tree(self, infile, outfile, preserve_mode=1, preserve_times=1,
preserve_symlinks=0, level=1):
"""Copy an entire directory tree respecting verbose, dry-run,
and force flags.
@@ -373,7 +371,6 @@ class Command:
return archive_util.make_archive(base_name, format, root_dir, base_dir,
dry_run=self.dry_run)
-
def make_file(self, infiles, outfile, func, args,
exec_msg=None, skip_msg=None, level=1):
"""Special case of 'execute()' for operations that process one or
@@ -406,7 +403,6 @@ class Command:
else:
log.debug(skip_msg)
-
# XXX 'install_misc' class not currently used -- it was the base class for
# both 'install_scripts' and 'install_data', but they outgrew it. It might
# still be useful for 'install_headers', though, so I'm keeping it around
@@ -423,10 +419,10 @@ class install_misc(Command):
self.install_dir = None
self.outfiles = []
- def _install_dir_from (self, dirname):
+ def _install_dir_from(self, dirname):
self.set_undefined_options('install', (dirname, 'install_dir'))
- def _copy_files (self, filelist):
+ def _copy_files(self, filelist):
self.outfiles = []
if not filelist:
return
@@ -435,5 +431,5 @@ class install_misc(Command):
self.copy_file(f, self.install_dir)
self.outfiles.append(os.path.join(self.install_dir, f))
- def get_outputs (self):
+ def get_outputs(self):
return self.outfiles