aboutsummaryrefslogtreecommitdiffstats
path: root/setuptools/msvc.py
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2018-03-17 14:10:32 -0400
committerJason R. Coombs <jaraco@jaraco.com>2018-03-17 14:10:32 -0400
commit929acc4e551448a68411968fb50336ad51ed4d3c (patch)
tree6eb60f4a8825bd6180746a984c423b15a5d57281 /setuptools/msvc.py
parentd0f7a33daba39f60aa402c094cd4276b8b6ce462 (diff)
downloadexternal_python_setuptools-929acc4e551448a68411968fb50336ad51ed4d3c.tar.gz
external_python_setuptools-929acc4e551448a68411968fb50336ad51ed4d3c.tar.bz2
external_python_setuptools-929acc4e551448a68411968fb50336ad51ed4d3c.zip
Setuptools now vendors its own direct dependencies (packaging, six, pyparsing). Ref #1296.
Diffstat (limited to 'setuptools/msvc.py')
-rw-r--r--setuptools/msvc.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 8e3b638f..5e20b3f1 100644
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -22,7 +22,7 @@ import sys
import platform
import itertools
import distutils.errors
-from pkg_resources.extern.packaging.version import LegacyVersion
+from setuptools.extern.packaging.version import LegacyVersion
from setuptools.extern.six.moves import filterfalse
@@ -48,7 +48,7 @@ else:
_msvc9_suppress_errors = (
# msvc9compiler isn't available on some platforms
ImportError,
-
+
# msvc9compiler raises DistutilsPlatformError in some
# environments. See #1118.
distutils.errors.DistutilsPlatformError,