diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2015-03-06 17:04:35 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2015-03-06 17:04:35 -0500 |
| commit | dbb11565d5880616866a608ce04f93b2b3efedd8 (patch) | |
| tree | 1ed31bcaf743f05ad91e4ef9742b0ea5245b0c22 /setuptools/msvc9_support.py | |
| parent | a979a4494369abbe40fcf65738fc78fc5ae88d7d (diff) | |
| parent | 4334bd87fdb0e60ed6e019ad2eb3ee103032d316 (diff) | |
| download | python-setuptools-bitbucket-dbb11565d5880616866a608ce04f93b2b3efedd8.tar.gz | |
Merge pull request #25 from dhellmann/fix-tox
Fix tox settings so they work
Diffstat (limited to 'setuptools/msvc9_support.py')
| -rw-r--r-- | setuptools/msvc9_support.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/setuptools/msvc9_support.py b/setuptools/msvc9_support.py index e76d70f0..a69c7474 100644 --- a/setuptools/msvc9_support.py +++ b/setuptools/msvc9_support.py @@ -1,5 +1,3 @@ -import sys - try: import distutils.msvc9compiler except ImportError: @@ -29,13 +27,15 @@ def patch_for_specialized_compiler(): def find_vcvarsall(version): Reg = distutils.msvc9compiler.Reg VC_BASE = r'Software\%sMicrosoft\DevDiv\VCForPython\%0.1f' + key = VC_BASE % ('', version) try: # Per-user installs register the compiler path here - productdir = Reg.get_value(VC_BASE % ('', version), "installdir") + productdir = Reg.get_value(key, "installdir") except KeyError: try: # All-user installs on a 64-bit system register here - productdir = Reg.get_value(VC_BASE % ('Wow6432Node\\', version), "installdir") + key = VC_BASE % ('Wow6432Node\\', version) + productdir = Reg.get_value(key, "installdir") except KeyError: productdir = None |
