diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2015-03-06 23:40:47 -0500 |
---|---|---|
committer | Jason R. Coombs <jaraco@jaraco.com> | 2015-03-06 23:40:47 -0500 |
commit | cbc3c959feecae75c1ce7864543c7f3a14b65ab0 (patch) | |
tree | ea17caf027e20ecf584f95853f0f0abe01887328 /setuptools/command/easy_install.py | |
parent | 16a4240286b5202e2a52c22efb63fc3c1ba7ab02 (diff) | |
download | external_python_setuptools-cbc3c959feecae75c1ce7864543c7f3a14b65ab0.tar.gz external_python_setuptools-cbc3c959feecae75c1ce7864543c7f3a14b65ab0.tar.bz2 external_python_setuptools-cbc3c959feecae75c1ce7864543c7f3a14b65ab0.zip |
Use 'path' to describe a file or directory.
Diffstat (limited to 'setuptools/command/easy_install.py')
-rwxr-xr-x | setuptools/command/easy_install.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index 0828be84..276b6f99 100755 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -204,16 +204,16 @@ class easy_install(Command): filename for filename in blockers if os.path.exists(filename) or os.path.islink(filename) ) - list(map(self._delete_filename, extant_blockers)) + list(map(self._delete_path, extant_blockers)) - def _delete_filename(self, filename): - log.info("Deleting %s", filename) + def _delete_path(self, path): + log.info("Deleting %s", path) if self.dry_run: return - is_tree = os.path.isdir(filename) and not os.path.islink(filename) + is_tree = os.path.isdir(path) and not os.path.islink(path) remover = rmtree if is_tree else os.unlink - remover(filename) + remover(path) def finalize_options(self): if self.version: |