Merge pull request #3225 from pypa/bugfix/3223

Fix encoding issues and python discovery
pypa · Nov 16, 2018 · 33e0718 · 33e0718
2 parents 3ada88f + 42ae127
commit 33e0718
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 12 deletions.
diff --git a/.azure-pipelines/steps/run-tests.yml b/.azure-pipelines/steps/run-tests.yml
@@ -11,7 +11,7 @@ steps:
     Write-Host "##vso[task.setvariable variable=TEMP]T:\"
     $env:TEMP='T:\'
     Write-Host "##vso[task.setvariable variable=TMP]T:\"
-    $env:TEMP='T:\'
+    $env:TMP='T:\'
     D:\.venv\Scripts\pipenv run pytest -ra --ignore=pipenv\patched --ignore=pipenv\vendor --junitxml=test-results.xml tests
   displayName: Run integration tests
 

diff --git a/news/3223.bugfix.rst b/news/3223.bugfix.rst
@@ -0,0 +1 @@
+Fixed an issue with attempting to render unicode output in non-unicode locales.
diff --git a/news/3224.bugfix.rst b/news/3224.bugfix.rst
@@ -0,0 +1 @@
+Fixed a bug which could cause failures to occur when parsing python entries from global pyenv version files.
diff --git a/pipenv/_compat.py b/pipenv/_compat.py
@@ -14,7 +14,6 @@
 import warnings
 import vistir
 from tempfile import _bin_openflags, gettempdir, _mkstemp_inner, mkdtemp
-from .utils import logging, rmtree
 
 try:
     from tempfile import _infer_return_type
@@ -55,6 +54,7 @@ def _infer_return_type(*args):
 
         class finalize(object):
             def __init__(self, *args, **kwargs):
+                from .utils import logging
                 logging.warn("weakref.finalize unavailable, not cleaning...")
 
             def detach(self):
@@ -100,7 +100,7 @@ def __init__(self, suffix="", prefix="", dir=None):
 
     @classmethod
     def _cleanup(cls, name, warn_message):
-        rmtree(name)
+        vistir.path.rmtree(name)
         warnings.warn(warn_message, ResourceWarning)
 
     def __repr__(self):
@@ -114,7 +114,7 @@ def __exit__(self, exc, value, tb):
 
     def cleanup(self):
         if self._finalizer.detach():
-            rmtree(self.name)
+            vistir.path.rmtree(self.name)
 
 
 def _sanitize_params(prefix, suffix, dir):
@@ -365,7 +365,9 @@ def force_encoding():
 
 UNICODE_TO_ASCII_TRANSLATION_MAP = {
     8230: u"...",
-    8211: u"-"
+    8211: u"-",
+    10004: u"x",
+    10008: u"Ok"
 }
 
 

diff --git a/pipenv/cli/command.py b/pipenv/cli/command.py
@@ -15,7 +15,6 @@
 
 from click_didyoumean import DYMCommandCollection
 
-from .. import environments
 from ..__version__ import __version__
 from .options import (
     CONTEXT_SETTINGS, PipenvGroup, code_option, common_options, deploy_option,
@@ -115,6 +114,7 @@ def cli(
             return 1
     if envs:
         echo("The following environment variables can be set, to do various things:\n")
+        from .. import environments
         for key in environments.__dict__:
             if key.startswith("PIPENV"):
                 echo("  - {0}".format(crayons.normal(key, bold=True)))
@@ -161,7 +161,8 @@ def cli(
         # --rm was passed…
         elif rm:
             # Abort if --system (or running in a virtualenv).
-            if environments.PIPENV_USE_SYSTEM:
+            from ..environments import PIPENV_USE_SYSTEM
+            if PIPENV_USE_SYSTEM:
                 echo(
                     crayons.red(
                         "You are attempting to remove a virtualenv that "

diff --git a/pipenv/environments.py b/pipenv/environments.py
@@ -3,7 +3,8 @@
 import os
 import sys
 from appdirs import user_cache_dir
-from .vendor.vistir.misc import fs_str, to_text
+from .vendor.vistir.misc import fs_str
+from ._compat import fix_utf8
 
 
 # HACK: avoid resolver.py uses the wrong byte code files.
@@ -275,6 +276,6 @@ def is_quiet(threshold=-1):
     return PIPENV_VERBOSITY <= threshold
 
 
-PIPENV_SPINNER_FAIL_TEXT = fs_str(to_text(u"✘ {0}")) if not PIPENV_HIDE_EMOJIS else ("{0}")
+PIPENV_SPINNER_FAIL_TEXT = fix_utf8(u"✘ {0}") if not PIPENV_HIDE_EMOJIS else ("{0}")
 
-PIPENV_SPINNER_OK_TEXT = fs_str(to_text(u"✔ {0}")) if not PIPENV_HIDE_EMOJIS else ("{0}")
+PIPENV_SPINNER_OK_TEXT = fix_utf8(u"✔ {0}") if not PIPENV_HIDE_EMOJIS else ("{0}")
diff --git a/pipenv/vendor/pythonfinder/models/python.py b/pipenv/vendor/pythonfinder/models/python.py
@@ -67,9 +67,9 @@ def get_version_order(self):
         ]
         versions = {v.name: v for v in version_paths}
         if self.is_pyenv:
-            version_order = [versions[v] for v in parse_pyenv_version_order()]
+            version_order = [versions[v] for v in parse_pyenv_version_order() if v in versions]
         elif self.is_asdf:
-            version_order = [versions[v] for v in parse_asdf_version_order()]
+            version_order = [versions[v] for v in parse_asdf_version_order() if v in versions]
         for version in version_order:
             version_paths.remove(version)
         if version_order:
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fixed an issue with attempting to render unicode output in non-unicode locales.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		Fixed a bug which could cause failures to occur when parsing python entries from global pyenv version files.