diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2017-04-08 10:44:34 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2017-04-08 10:44:34 -0400 |
| commit | b50fdf497d6970002a2f7156650d7da21e2e39f5 (patch) | |
| tree | 1ecda049e94f2978680cf4d42b3f49288db0f2d5 /setuptools/msvc.py | |
| parent | 1d928cbc7b2cfcf1ffd2ec27f83ee33f0af39dfe (diff) | |
| download | external_python_setuptools-b50fdf497d6970002a2f7156650d7da21e2e39f5.tar.gz external_python_setuptools-b50fdf497d6970002a2f7156650d7da21e2e39f5.tar.bz2 external_python_setuptools-b50fdf497d6970002a2f7156650d7da21e2e39f5.zip | |
In msvc9_query_vcvarsall, ensure dict values are not unicode. Fixes #992.
Diffstat (limited to 'setuptools/msvc.py')
| -rw-r--r-- | setuptools/msvc.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/setuptools/msvc.py b/setuptools/msvc.py index d739178b..1e7a3277 100644 --- a/setuptools/msvc.py +++ b/setuptools/msvc.py @@ -26,6 +26,7 @@ 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 @@ -134,11 +135,13 @@ def msvc9_query_vcvarsall(ver, arch='x86', *args, **kwargs): # If error, try to set environment directly try: - return EnvironmentInfo(arch, ver).return_env() + env = EnvironmentInfo(arch, ver).return_env() except distutils.errors.DistutilsPlatformError as exc: _augment_exception(exc, ver, arch) raise + return py27compat.make_dict_values_strings(env) + def msvc14_get_vc_env(plat_spec): """ |