diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2016-07-02 12:47:53 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2016-07-02 12:47:53 -0400 |
| commit | e404a4aa3b3aa62c5f2c956f3076ddb9155a6829 (patch) | |
| tree | cb9eb21936f151227df5aa1da5523135f4173c9e /setuptools/msvc.py | |
| parent | 0746957d513d74e6a9f5e2375a10d1d4a0a5108c (diff) | |
| download | external_python_setuptools-e404a4aa3b3aa62c5f2c956f3076ddb9155a6829.tar.gz external_python_setuptools-e404a4aa3b3aa62c5f2c956f3076ddb9155a6829.tar.bz2 external_python_setuptools-e404a4aa3b3aa62c5f2c956f3076ddb9155a6829.zip | |
Reindent to avoid raw strings and hanging indents. Let os.path.join provide the backslash characters.
Diffstat (limited to 'setuptools/msvc.py')
| -rw-r--r-- | setuptools/msvc.py | 40 |
1 files changed, 28 insertions, 12 deletions
diff --git a/setuptools/msvc.py b/setuptools/msvc.py index 27118ed9..0b483ea3 100644 --- a/setuptools/msvc.py +++ b/setuptools/msvc.py @@ -896,18 +896,34 @@ class EnvironmentInfo: libpath += [os.path.join(ref, r'CommonConfiguration\Neutral')] if self.vc_ver >= 14.0: - libpath += [ref, - os.path.join(self.si.WindowsSdkDir, 'UnionMetadata'), - os.path.join(ref, 'Windows.Foundation.' - r'UniversalApiContract\1.0.0.0'), - os.path.join(ref, 'Windows.Foundation.' - r'FoundationContract\1.0.0.0'), - os.path.join(ref, 'Windows.Networking.Connectivity.' - r'WwanContract\1.0.0.0'), - os.path.join(self.si.WindowsSdkDir, 'ExtensionSDKs' - r'\Microsoft.VCLibs\%0.1f\References' - r'\CommonConfiguration\neutral' % - self.vc_ver)] + libpath += [ + ref, + os.path.join(self.si.WindowsSdkDir, 'UnionMetadata'), + os.path.join( + ref, + 'Windows.Foundation.UniversalApiContract' + '1.0.0.0', + ), + os.path.join( + ref, + 'Windows.Foundation.FoundationContract', + '1.0.0.0', + ), + os.path.join( + ref, + 'Windows.Networking.Connectivity.WwanContract' + '1.0.0.0', + ), + os.path.join( + self.si.WindowsSdkDir, + 'ExtensionSDKs', + 'Microsoft.VCLibs', + '%0.1f' % self.vc_ver, + 'References', + 'CommonConfiguration', + 'neutral', + ), + ] return libpath @property |