Merge pull request pypa#5092 from pfmoore/vendor_fixes

Fixes to vendoring scripts so they work on Windows
cdutr · Mar 20, 2018 · 8dbdb74 · 8dbdb74
2 parents 86da211 + 359bd4f
commit 8dbdb74
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1,2 @@
+# Patches must have Unix-style line endings, even on Windows
+tasks/vendoring/patches/* eol=lf
diff --git a/tasks/vendoring/__init__.py b/tasks/vendoring/__init__.py
@@ -73,7 +73,7 @@ def rewrite_imports(package_dir, vendored_libs):
 
 def rewrite_file_imports(item, vendored_libs):
     """Rewrite 'import xxx' and 'from xxx import' for vendored_libs"""
-    text = item.read_text()
+    text = item.read_text(encoding='utf-8')
     # Revendor pkg_resources.extern first
     text = re.sub(r'pkg_resources.extern', r'pip._vendor', text)
     for lib in vendored_libs:
@@ -87,7 +87,7 @@ def rewrite_file_imports(item, vendored_libs):
             r'\1from pip._vendor.%s' % lib,
             text,
         )
-    item.write_text(text)
+    item.write_text(text, encoding='utf-8')
 
 
 def apply_patch(ctx, patch_file_path):