Commit 0746957d authored by Jason R. Coombs's avatar Jason R. Coombs

Remove superfluous raw strings

parent f2a0b309
...@@ -219,9 +219,9 @@ def _augment_exception(exc, version, arch=''): ...@@ -219,9 +219,9 @@ def _augment_exception(exc, version, arch=''):
if "vcvarsall" in message.lower() or "visual c" in message.lower(): if "vcvarsall" in message.lower() or "visual c" in message.lower():
# Special error message if MSVC++ not installed # Special error message if MSVC++ not installed
tmpl = 'Microsoft Visual C++ %0.1f is required (%s).' tmpl = 'Microsoft Visual C++ {version:0.1f} is required {message}.'
message = tmpl % version, message message = tmpl.format(**locals())
msdownload = r'www.microsoft.com/download/details.aspx?id=%d' msdownload = 'www.microsoft.com/download/details.aspx?id=%d'
if version == 9.0: if version == 9.0:
if arch.lower().find('ia64') > -1: if arch.lower().find('ia64') > -1:
# For VC++ 9.0, if IA64 support is needed, redirect user # For VC++ 9.0, if IA64 support is needed, redirect user
...@@ -232,7 +232,7 @@ def _augment_exception(exc, version, arch=''): ...@@ -232,7 +232,7 @@ def _augment_exception(exc, version, arch=''):
# For VC++ 9.0 redirect user to Vc++ for Python 2.7 : # For VC++ 9.0 redirect user to Vc++ for Python 2.7 :
# This redirection link is maintained by Microsoft. # This redirection link is maintained by Microsoft.
# Contact vspython@microsoft.com if it needs updating. # Contact vspython@microsoft.com if it needs updating.
message += r' Get it from http://aka.ms/vcpython27' message += ' Get it from http://aka.ms/vcpython27'
elif version == 10.0: elif version == 10.0:
# For VC++ 10.0 Redirect user to Windows SDK 7.1 # For VC++ 10.0 Redirect user to Windows SDK 7.1
message += ' Get it with "Microsoft Windows SDK 7.1": ' message += ' Get it with "Microsoft Windows SDK 7.1": '
...@@ -365,7 +365,7 @@ class RegistryInfo: ...@@ -365,7 +365,7 @@ class RegistryInfo:
""" """
Microsoft Visual Studio root registry key. Microsoft Visual Studio root registry key.
""" """
return os.path.join(self.microsoft, r'VisualStudio') return os.path.join(self.microsoft, 'VisualStudio')
@property @property
def sxs(self): def sxs(self):
...@@ -860,7 +860,7 @@ class EnvironmentInfo: ...@@ -860,7 +860,7 @@ class EnvironmentInfo:
arch_subdir = self.pi.target_dir(x64=True) arch_subdir = self.pi.target_dir(x64=True)
lib = os.path.join(self.si.WindowsSdkDir, 'lib') lib = os.path.join(self.si.WindowsSdkDir, 'lib')
libver = self._get_content_dirname(lib) libver = self._get_content_dirname(lib)
return [os.path.join(lib, r'%sum%s' % (libver, arch_subdir))] return [os.path.join(lib, '%sum%s' % (libver, arch_subdir))]
@property @property
def OSIncludes(self): def OSIncludes(self):
...@@ -898,13 +898,13 @@ class EnvironmentInfo: ...@@ -898,13 +898,13 @@ class EnvironmentInfo:
if self.vc_ver >= 14.0: if self.vc_ver >= 14.0:
libpath += [ref, libpath += [ref,
os.path.join(self.si.WindowsSdkDir, 'UnionMetadata'), os.path.join(self.si.WindowsSdkDir, 'UnionMetadata'),
os.path.join(ref, r'Windows.Foundation.' os.path.join(ref, 'Windows.Foundation.'
r'UniversalApiContract\1.0.0.0'), r'UniversalApiContract\1.0.0.0'),
os.path.join(ref, r'Windows.Foundation.' os.path.join(ref, 'Windows.Foundation.'
r'FoundationContract\1.0.0.0'), r'FoundationContract\1.0.0.0'),
os.path.join(ref, r'Windows.Networking.Connectivity.' os.path.join(ref, 'Windows.Networking.Connectivity.'
r'WwanContract\1.0.0.0'), r'WwanContract\1.0.0.0'),
os.path.join(self.si.WindowsSdkDir, r'ExtensionSDKs' os.path.join(self.si.WindowsSdkDir, 'ExtensionSDKs'
r'\Microsoft.VCLibs\%0.1f\References' r'\Microsoft.VCLibs\%0.1f\References'
r'\CommonConfiguration\neutral' % r'\CommonConfiguration\neutral' %
self.vc_ver)] self.vc_ver)]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment