diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2017-04-16 09:00:53 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2017-04-16 09:00:53 -0500 |
| commit | 74b46ceaf9affd65da0ba0d2d56e58a85955a652 (patch) | |
| tree | 5ff28e0460252b4bc784d4818e425880b521b3af /setuptools/msvc.py | |
| parent | 862da01619666f94a56724180a31753bf98fd29d (diff) | |
| download | external_python_setuptools-74b46ceaf9affd65da0ba0d2d56e58a85955a652.tar.gz external_python_setuptools-74b46ceaf9affd65da0ba0d2d56e58a85955a652.tar.bz2 external_python_setuptools-74b46ceaf9affd65da0ba0d2d56e58a85955a652.zip | |
Revert "In msvc9_query_vcvarsall, ensure dict values are not unicode. Fixes #992."
This reverts commit b50fdf497d6970002a2f7156650d7da21e2e39f5.
Diffstat (limited to 'setuptools/msvc.py')
| -rw-r--r-- | setuptools/msvc.py | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/setuptools/msvc.py b/setuptools/msvc.py index 3110eaff..84dcb2a7 100644 --- a/setuptools/msvc.py +++ b/setuptools/msvc.py @@ -27,7 +27,6 @@ from packaging.version import LegacyVersion from six.moves import filterfalse from .monkey import get_unpatched -from . import py27compat if platform.system() == 'Windows': from six.moves import winreg @@ -136,13 +135,11 @@ def msvc9_query_vcvarsall(ver, arch='x86', *args, **kwargs): # If error, try to set environment directly try: - env = EnvironmentInfo(arch, ver).return_env() + return EnvironmentInfo(arch, ver).return_env() except distutils.errors.DistutilsPlatformError as exc: _augment_exception(exc, ver, arch) raise - return py27compat.dict_values_strings(env) - def msvc14_get_vc_env(plat_spec): """ |