| Index: third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/server_base.py
|
| diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/server_base.py b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/server_base.py
|
| index 4cd293534b66a4b7311567a7376d22d7ca591e33..d9fc60994ab918c75b377ea2197ecb3a9dbe4ab5 100644
|
| --- a/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/server_base.py
|
| +++ b/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/servers/server_base.py
|
| @@ -158,7 +158,7 @@ class ServerBase(object):
|
| for log_prefix in self._log_prefixes:
|
| try:
|
| self._remove_log_files(self._output_dir, log_prefix)
|
| - except OSError, e:
|
| + except OSError as e:
|
| _log.warning('Failed to remove old %s %s files' % (self._name, log_prefix))
|
|
|
| def _spawn_process(self):
|
| @@ -254,7 +254,7 @@ class ServerBase(object):
|
| try:
|
| s.connect(('localhost', port))
|
| _log.debug("Server running on %d" % port)
|
| - except IOError, e:
|
| + except IOError as e:
|
| if e.errno not in (errno.ECONNREFUSED, errno.ECONNRESET):
|
| raise
|
| _log.debug("Server NOT running on %d: %s" % (port, e))
|
| @@ -271,7 +271,7 @@ class ServerBase(object):
|
| port = mapping['port']
|
| try:
|
| s.bind(('localhost', port))
|
| - except IOError, e:
|
| + except IOError as e:
|
| if e.errno in (errno.EALREADY, errno.EADDRINUSE):
|
| raise ServerError('Port %d is already in use.' % port)
|
| elif self._platform.is_win() and e.errno in (errno.WSAEACCES,): # pylint: disable=E1101
|
|
|