aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormergify[bot] <37929162+mergify[bot]@users.noreply.github.com>2019-10-28 18:08:37 +0000
committerGitHub <noreply@github.com>2019-10-28 18:08:37 +0000
commita46a938686f3ae3bf3b8d2a104a659be20d511b8 (patch)
tree03164235e4e53d2a11aa03236c480226f4055c25
parent6e8b1da1fb146186c52d8bdec5af969f26532ece (diff)
parent7489ea4047661a7dbd46ff155abe45c548284676 (diff)
downloadexternal_python_setuptools-a46a938686f3ae3bf3b8d2a104a659be20d511b8.tar.gz
external_python_setuptools-a46a938686f3ae3bf3b8d2a104a659be20d511b8.tar.bz2
external_python_setuptools-a46a938686f3ae3bf3b8d2a104a659be20d511b8.zip
Merge pull request #1892 from benoit-pierre/fix_1891
Fix code for detecting Visual Studio's version on Windows under Python 2.
-rw-r--r--changelog.d/1891.change.rst1
-rw-r--r--setuptools/msvc.py1
2 files changed, 2 insertions, 0 deletions
diff --git a/changelog.d/1891.change.rst b/changelog.d/1891.change.rst
new file mode 100644
index 00000000..81ccff10
--- /dev/null
+++ b/changelog.d/1891.change.rst
@@ -0,0 +1 @@
+Fix code for detecting Visual Studio's version on Windows under Python 2.
diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index ffa7053b..2ffe1c81 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -20,6 +20,7 @@ This may also support compilers shipped with compatible Visual Studio versions.
"""
import json
+from io import open
from os import listdir, pathsep
from os.path import join, isfile, isdir, dirname
import sys