From 65c004dcb11d2e38aa8f2285e351404f8142b9c1 Mon Sep 17 00:00:00 2001 From: Xavier Fernandez Date: Fri, 19 Dec 2014 15:33:59 +0100 Subject: [PATCH] remove InstallRequirement.delete_marker_filename --- pip/req/req_install.py | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pip/req/req_install.py b/pip/req/req_install.py index 08c8c39d1c7..16247baf1ae 100644 --- a/pip/req/req_install.py +++ b/pip/req/req_install.py @@ -875,11 +875,11 @@ def prepend_root(path): def remove_temporary_source(self): """Remove the source files from this requirement, if they are marked for deletion""" - if os.path.exists(self.delete_marker_filename): + if self.source_dir and os.path.exists( + os.path.join(self.source_dir, PIP_DELETE_MARKER_FILENAME)): logger.debug('Removing source in %s', self.source_dir) - if self.source_dir: - rmtree(self.source_dir) - self.source_dir = None + rmtree(self.source_dir) + self.source_dir = None if self._temp_build_dir and os.path.exists(self._temp_build_dir): rmtree(self._temp_build_dir) self._temp_build_dir = None @@ -988,11 +988,6 @@ def move_wheel_files(self, wheeldir, root=None): isolated=self.isolated, ) - @property - def delete_marker_filename(self): - assert self.source_dir - return os.path.join(self.source_dir, PIP_DELETE_MARKER_FILENAME) - def _strip_postfix(req): """