Index: Tools/Scripts/webkitpy/layout_tests/port/win.py |
diff --git a/Tools/Scripts/webkitpy/layout_tests/port/win.py b/Tools/Scripts/webkitpy/layout_tests/port/win.py |
index f20649701f37f49f2ca69fc81eae00c7ac0d285d..40d8c6507fefe47cef3cbcc1b7696b789c1fbcf6 100644 |
--- a/Tools/Scripts/webkitpy/layout_tests/port/win.py |
+++ b/Tools/Scripts/webkitpy/layout_tests/port/win.py |
@@ -53,7 +53,7 @@ class WinPort(base.Port): |
# FIXME: Figure out how to unify this with base.TestConfiguration.all_systems()? |
SUPPORTED_VERSIONS = ('xp', 'win7') |
- FALLBACK_PATHS = { 'win7': [ 'win' ]} |
+ FALLBACK_PATHS = {'win7': ['win']} |
FALLBACK_PATHS['xp'] = ['win-xp'] + FALLBACK_PATHS['win7'] |
DEFAULT_BUILD_DIRECTORIES = ('build', 'out') |
@@ -75,7 +75,7 @@ class WinPort(base.Port): |
def __init__(self, host, port_name, **kwargs): |
super(WinPort, self).__init__(host, port_name, **kwargs) |
self._version = port_name[port_name.index('win-') + len('win-'):] |
- assert self._version in self.SUPPORTED_VERSIONS, "%s is not in %s" % (self._version, self.SUPPORTED_VERSIONS) |
+ assert self._version in self.SUPPORTED_VERSIONS, '%s is not in %s' % (self._version, self.SUPPORTED_VERSIONS) |
if not self.get_option('disable_breakpad'): |
self._dump_reader = DumpReaderWin(host, self._build_path()) |
self._crash_service = None |
@@ -99,7 +99,7 @@ class WinPort(base.Port): |
res = self._check_reg(r'.cgi\Shell\ExecCGI\Command') and res |
res = self._check_reg(r'.pl\Shell\ExecCGI\Command') and res |
else: |
- _log.warning("Could not check the registry; http may not work correctly.") |
+ _log.warning('Could not check the registry; http may not work correctly.') |
return res |
@@ -117,7 +117,7 @@ class WinPort(base.Port): |
# existing entry points to a valid path and has the right command line. |
if len(args) == 2 and self._filesystem.exists(args[0]) and args[0].endswith('perl.exe') and args[1] == '-wT': |
return True |
- except WindowsError, e: |
+ except WindowsError as e: |
if e.errno != errno.ENOENT: |
raise e |
# The key simply probably doesn't exist. |
@@ -136,7 +136,7 @@ class WinPort(base.Port): |
if not self.get_option('disable_breakpad'): |
assert not self._crash_service, 'Already running a crash service' |
- if self._crash_service_available == None: |
+ if self._crash_service_available is None: |
self._crash_service_available = self._check_crash_service_available() |
if not self._crash_service_available: |
return |
@@ -162,12 +162,12 @@ class WinPort(base.Port): |
env[key] = value |
# Put the cygwin directory first in the path to find cygwin1.dll. |
- env["PATH"] = "%s;%s" % (self.path_from_chromium_base("third_party", "cygwin", "bin"), env["PATH"]) |
+ env['PATH'] = '%s;%s' % (self.path_from_chromium_base('third_party', 'cygwin', 'bin'), env['PATH']) |
# Configure the cygwin directory so that pywebsocket finds proper |
# python executable to run cgi program. |
- env["CYGWIN_PATH"] = self.path_from_chromium_base("third_party", "cygwin", "bin") |
+ env['CYGWIN_PATH'] = self.path_from_chromium_base('third_party', 'cygwin', 'bin') |
if self.get_option('register_cygwin'): |
- setup_mount = self.path_from_chromium_base("third_party", "cygwin", "setup_mount.bat") |
+ setup_mount = self.path_from_chromium_base('third_party', 'cygwin', 'setup_mount.bat') |
self._executive.run_command([setup_mount]) # Paths are all absolute, so this does not require a cwd. |
return env |
@@ -229,7 +229,7 @@ class WinPort(base.Port): |
def _check_crash_service_available(self): |
"""Checks whether the crash service binary is present.""" |
- result = self._check_file_exists(self._path_to_crash_service(), "content_shell_crash_service.exe") |
+ result = self._check_file_exists(self._path_to_crash_service(), 'content_shell_crash_service.exe') |
if not result: |
_log.error(" Could not find crash service, unexpected crashes won't be symbolized.") |
_log.error(' Did you build the target blink_tests?') |