Add proof of concept fix for Unicode bug

With these minimal changes the exmaple.zip from pypa#5972 installs correctly on Windows. Link: pypa#5972 Signed-off-by: Philippe Ombredanne <[email protected]>
pombredanne · Jun 28, 2019 · 84a792b · 84a792b
1 parent 58c93ac
commit 84a792b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/src/pip/_internal/req/constructors.py b/src/pip/_internal/req/constructors.py
@@ -213,6 +213,7 @@ def install_req_from_line(
     """Creates an InstallRequirement from a name, which might be a
     requirement, directory containing 'setup.py', filename, or URL.
     """
+    name = unicode(name)
     if is_url(name):
         marker_sep = '; '
     else:

diff --git a/src/pip/_internal/utils/misc.py b/src/pip/_internal/utils/misc.py
@@ -724,6 +724,7 @@ def call_subprocess(
         env.update(extra_environ)
     for name in unset_environ:
         env.pop(name, None)
+    env = {k: str(v) if isinstance(v, unicode) else v for k, v in env.items()}     
     try:
         proc = subprocess.Popen(
             cmd, stderr=subprocess.STDOUT, stdin=subprocess.PIPE,

diff --git a/src/pip/_internal/utils/temp_dir.py b/src/pip/_internal/utils/temp_dir.py
@@ -72,7 +72,7 @@ def create(self):
         # scripts, so we canonicalize the path by traversing potential
         # symlinks here.
         self.path = os.path.realpath(
-            tempfile.mkdtemp(prefix="pip-{}-".format(self.kind))
+            tempfile.mkdtemp(prefix=u"pip-{}-".format(self.kind))
         )
         logger.debug("Created temporary directory: {}".format(self.path))
 
@@ -150,6 +150,6 @@ def create(self):
         if not self.path:
             # Final fallback on the default behavior.
             self.path = os.path.realpath(
-                tempfile.mkdtemp(prefix="pip-{}-".format(self.kind))
+                tempfile.mkdtemp(prefix=u"pip-{}-".format(self.kind))
             )
         logger.debug("Created temporary directory: {}".format(self.path))