Merge monkeypatch-module

1 files changed, 4 insertions, 13 deletions

diff --git a/setuptools/extension.py b/setuptools/extension.py
index f8058b72..03068d35 100644
--- a/setuptools/extension.py
+++ b/setuptools/extension.py
@@ -1,4 +1,3 @@
-import sys
 import re
 import functools
 import distutils.core
@@ -7,12 +6,7 @@ import distutils.extension
 
 from setuptools.extern.six.moves import map
 
-from .dist import _get_unpatched
-from . import msvc
-
-_Extension = _get_unpatched(distutils.core.Extension)
-
-msvc.patch_for_specialized_compiler()
+from .monkey import get_unpatched
 
 
 def _have_cython():
@@ -33,6 +27,9 @@ def _have_cython():
 have_pyrex = _have_cython
 
 
+_Extension = get_unpatched(distutils.core.Extension)
+
+
 class Extension(_Extension):
     """Extension that uses '.c' files in place of '.pyx' files"""
 
@@ -59,9 +56,3 @@ class Extension(_Extension):
 
 class Library(Extension):
     """Just like a regular Extension, but built as a library instead"""
-
-
-distutils.core.Extension = Extension
-distutils.extension.Extension = Extension
-if 'distutils.command.build_ext' in sys.modules:
-    sys.modules['distutils.command.build_ext'].Extension = Extension