From cbc3c959feecae75c1ce7864543c7f3a14b65ab0 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Fri, 6 Mar 2015 23:40:47 -0500 Subject: Use 'path' to describe a file or directory. --- setuptools/command/easy_install.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'setuptools/command/easy_install.py') 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: -- cgit v1.2.3