Vendoring: Make sure to only rewrite relevant imports

If there is an import from hamster, while we vendor ham, we should not rewrite it. Fixes #5347
pypa · Apr 28, 2018 · 461d946 · 461d946
1 parent daaa0fd
commit 461d946
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/news/5347.bugfix b/news/5347.bugfix
@@ -0,0 +1 @@
+Fix the revendoring script no to rewrite unrelated import that starts suspicious. 
diff --git a/tasks/vendoring/__init__.py b/tasks/vendoring/__init__.py
@@ -83,8 +83,8 @@ def rewrite_file_imports(item, vendored_libs):
             text,
         )
         text = re.sub(
-            r'(\n\s*)from %s' % lib,
-            r'\1from pip._vendor.%s' % lib,
+            r'(\n\s*)from %s(\.|\s+)' % lib,
+            r'\1from pip._vendor.%s\2' % lib,
             text,
         )
     item.write_text(text, encoding='utf-8')
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fix the revendoring script no to rewrite unrelated import that starts suspicious.