diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-09-09 12:39:43 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-09-09 12:39:43 -0400 |
| commit | b6f2fee975c570d2beadb9007e6302411f91ab4b (patch) | |
| tree | 775b9637580605b4b6d7b647f035fb1d8d0bec41 /setuptools/msvc.py | |
| parent | 5cc0ec25c0ef816de01b7416aa6bef172f91566d (diff) | |
| download | external_python_setuptools-b6f2fee975c570d2beadb9007e6302411f91ab4b.tar.gz external_python_setuptools-b6f2fee975c570d2beadb9007e6302411f91ab4b.tar.bz2 external_python_setuptools-b6f2fee975c570d2beadb9007e6302411f91ab4b.zip | |
Consolidate function patching and resolution of unpatched function, aligning pattern with the patched classes.
Diffstat (limited to 'setuptools/msvc.py')
| -rw-r--r-- | setuptools/msvc.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/setuptools/msvc.py b/setuptools/msvc.py index a902a4a7..ae5a2b6a 100644 --- a/setuptools/msvc.py +++ b/setuptools/msvc.py @@ -24,7 +24,7 @@ from pkg_resources.extern.packaging.version import LegacyVersion from setuptools.extern.six.moves import filterfalse -from . import monkey +from .monkey import get_unpatched_func if platform.system() == 'Windows': from setuptools.extern.six.moves import winreg @@ -87,7 +87,7 @@ def msvc9_find_vcvarsall(version): if os.path.isfile(vcvarsall): return vcvarsall - return monkey.unpatched['msvc9_find_vcvarsall'](version) + return get_unpatched_func(msvc9_find_vcvarsall)(version) def msvc9_query_vcvarsall(ver, arch='x86', *args, **kwargs): @@ -120,7 +120,7 @@ def msvc9_query_vcvarsall(ver, arch='x86', *args, **kwargs): """ # Try to get environement from vcvarsall.bat (Classical way) try: - orig = monkey.unpatched['msvc9_query_vcvarsall'] + orig = get_unpatched_func(msvc9_query_vcvarsall) return orig(ver, arch, *args, **kwargs) except distutils.errors.DistutilsPlatformError: # Pass error if Vcvarsall.bat is missing @@ -160,7 +160,7 @@ def msvc14_get_vc_env(plat_spec): """ # Try to get environment from vcvarsall.bat (Classical way) try: - return monkey.unpatched['msvc14_get_vc_env'](plat_spec) + return get_unpatched_func(msvc14_get_vc_env)(plat_spec) except distutils.errors.DistutilsPlatformError: # Pass error Vcvarsall.bat is missing pass @@ -183,7 +183,7 @@ def msvc14_gen_lib_options(*args, **kwargs): import numpy as np if LegacyVersion(np.__version__) < LegacyVersion('1.11.2'): return np.distutils.ccompiler.gen_lib_options(*args, **kwargs) - return monkey.unpatched['msvc14_gen_lib_options'](*args, **kwargs) + return get_unpatched_func(msvc14_gen_lib_options)(*args, **kwargs) def _augment_exception(exc, version, arch=''): |