diff options
| author |  kpayson64 <kpayson@google.com> | 2018-05-11 12:20:11 -0700 |
|---|---|---|
| committer | kpayson64 <kpayson@google.com> | 2018-05-11 12:20:11 -0700 |
| commit | 4fad281ce8affe27fb7428f264d2c3b9dfc45f2f (patch) | |
| tree | ca96c9efd69afec56aa2e5fe072a9f758247d0a3 /src/python/grpcio_tests/tests/unit/_cython/test_utilities.py | |
| parent | ec445cc2bb270ed4acb1c710c3533fca14a50019 (diff) | |
| parent | 61fdb46ac456027c79841949272ec540f66d2317 (diff) | |
Merge remote-tracking branch 'upstream/master' into fork_exec_ctx_check
Diffstat (limited to 'src/python/grpcio_tests/tests/unit/_cython/test_utilities.py')
| -rw-r--r-- | src/python/grpcio_tests/tests/unit/_cython/test_utilities.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/python/grpcio_tests/tests/unit/_cython/test_utilities.py b/src/python/grpcio_tests/tests/unit/_cython/test_utilities.py index 4a00b9ef2f..7d5eaaaa84 100644 --- a/src/python/grpcio_tests/tests/unit/_cython/test_utilities.py +++ b/src/python/grpcio_tests/tests/unit/_cython/test_utilities.py @@ -25,7 +25,7 @@ class SimpleFuture(object): def wrapped_function(): try: self._result = function(*args, **kwargs) - except Exception as error: + except Exception as error: # pylint: disable=broad-except self._error = error self._result = None @@ -41,7 +41,7 @@ class SimpleFuture(object): self._thread.join() if self._error: # TODO(atash): re-raise exceptions in a way that preserves tracebacks - raise self._error + raise self._error # pylint: disable=raising-bad-type return self._result |