Reindent to avoid raw strings and hanging indents. Let os.path.join provide...

Reindent to avoid raw strings and hanging indents. Let os.path.join provide the backslash characters.

Reindent to avoid raw strings and hanging indents. Let os.path.join provide...
Reindent to avoid raw strings and hanging indents. Let os.path.join provide the backslash characters.
e404a4aa · Jason R. Coombs · 0746957d · e404a4aa
Commit e404a4aa authored Jul 02, 2016 by Jason R. Coombs
Show whitespace changes
Inline Side-by-side

Showing with 28 additions and 12 deletions

setuptools/msvc.py setuptools/msvc.py +28 -12

No files found.
--- 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,
+            libpath += [
+                ref,
                os.path.join(self.si.WindowsSdkDir, 'UnionMetadata'),
-                        os.path.join(ref, 'Windows.Foundation.'
+                os.path.join(
-                                     r'UniversalApiContract\1.0.0.0'),
+                    ref,
-                        os.path.join(ref, 'Windows.Foundation.'
+                    'Windows.Foundation.UniversalApiContract'
-                                     r'FoundationContract\1.0.0.0'),
+                    '1.0.0.0',
-                        os.path.join(ref, 'Windows.Networking.Connectivity.'
+                ),
-                                     r'WwanContract\1.0.0.0'),
+                os.path.join(
-                        os.path.join(self.si.WindowsSdkDir, 'ExtensionSDKs'
+                    ref,
-                                     r'\Microsoft.VCLibs\%0.1f\References'
+                    'Windows.Foundation.FoundationContract',
-                                     r'\CommonConfiguration\neutral' %
+                    '1.0.0.0',
-                                     self.vc_ver)]
+                ),
+                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