aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2016-09-09 11:54:40 -0400
committerGitHub <noreply@github.com>2016-09-09 11:54:40 -0400
commitf780be54cbcaf324dca311e1b6a3915cc23fd934 (patch)
tree161c04caed6f6becda164b8a2f0edd2406eeadb1
parenta5eba2162977f28450bbc7c53b09f2272d7c118a (diff)
parenta6524a5c0d40aedbaa06eb41c70990c44a1dfd15 (diff)
downloadexternal_python_setuptools-f780be54cbcaf324dca311e1b6a3915cc23fd934.tar.gz
external_python_setuptools-f780be54cbcaf324dca311e1b6a3915cc23fd934.tar.bz2
external_python_setuptools-f780be54cbcaf324dca311e1b6a3915cc23fd934.zip
Merge pull request #781 from dstufft/fix-import
Move msvc import to avoid a circular import
-rw-r--r--setuptools/monkey.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/setuptools/monkey.py b/setuptools/monkey.py
index 63891e74..33083831 100644
--- a/setuptools/monkey.py
+++ b/setuptools/monkey.py
@@ -7,7 +7,6 @@ import distutils.filelist
import platform
import setuptools
-from . import msvc
__all__ = []
@@ -112,6 +111,8 @@ def patch_for_msvc_specialized_compiler():
Patch functions in distutils to use standalone Microsoft Visual C++
compilers.
"""
+ from . import msvc
+
try:
# Distutil file for MSVC++ 9.0 and upper (Python 2.7 to 3.4)
import distutils.msvc9compiler as msvc9compiler