diff options
Diffstat (limited to 'catapult/devil/devil/utils/reraiser_thread.py')
| -rw-r--r-- | catapult/devil/devil/utils/reraiser_thread.py | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/catapult/devil/devil/utils/reraiser_thread.py b/catapult/devil/devil/utils/reraiser_thread.py index 6e6c810b..e48dda92 100644 --- a/catapult/devil/devil/utils/reraiser_thread.py +++ b/catapult/devil/devil/utils/reraiser_thread.py @@ -1,7 +1,6 @@ # Copyright 2013 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. - """Thread and ThreadGroup that reraise exceptions on the main thread.""" # pylint: disable=W0212 @@ -17,6 +16,7 @@ from devil.utils import watchdog_timer class TimeoutError(base_error.BaseError): """Module-specific timeout exception.""" + def __init__(self, message): super(TimeoutError, self).__init__(message) @@ -69,13 +69,14 @@ class ReraiserThread(threading.Thread): self._exc_info = None self._thread_group = None - if sys.version_info < (3,): + if sys.version_info < (3, ): # pylint: disable=exec-used - exec('''def ReraiseIfException(self): + exec ('''def ReraiseIfException(self): """Reraise exception if an exception was raised in the thread.""" if self._exc_info: raise self._exc_info[0], self._exc_info[1], self._exc_info[2]''') else: + def ReraiseIfException(self): """Reraise exception if an exception was raised in the thread.""" if self._exc_info: |