Merge pull request #5233 from pradyunsg/fix/5219

Make the Windows "self-modification" check more strict
pypa · Apr 17, 2018 · ea1319d · ea1319d
2 parents 5ea5c4d + 2a085b3
commit ea1319d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/news/5219.bugfix b/news/5219.bugfix
@@ -0,0 +1 @@
+Fix a bug that made get-pip.py unusable on Windows without renaming.
diff --git a/src/pip/_internal/basecommand.py b/src/pip/_internal/basecommand.py
@@ -335,8 +335,8 @@ def populate_requirement_set(requirement_set, args, options, finder,
         # See https://github.com/pypa/pip/issues/1299 for more discussion
         should_show_use_python_msg = (
             WINDOWS and
-            requirement_set.has_requirement('pip') and
-            "pip" in os.path.basename(sys.argv[0])
+            requirement_set.has_requirement("pip") and
+            os.path.basename(sys.argv[0]).startswith("pip")
         )
         if should_show_use_python_msg:
             new_command = [