diff options
| author |  kpayson64 <kpayson@google.com> | 2016-07-08 14:52:20 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2016-07-08 14:52:20 -0700 |
| commit | acb0207b63ddcdf45ea75c52f82dbd5423a6069f (patch) | |
| tree | c287d52f5b905a3039f2ffce25f40a886bd51fbd /src/python/grpcio | |
| parent | 32d3fbe284ddd7e90b49cdf72349d661869969ca (diff) | |
| parent | 4dd9ca9a6edb96ac5c880fc98656109c78e8a615 (diff) | |
Merge pull request #7272 from nathanielmanistaatgoogle/rendezvous-exception
Fix _Rendezvous.exception for successful calls
Diffstat (limited to 'src/python/grpcio')
| -rw-r--r-- | src/python/grpcio/grpc/beta/_client_adaptations.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/python/grpcio/grpc/beta/_client_adaptations.py b/src/python/grpcio/grpc/beta/_client_adaptations.py index 56456cc117..73415e0be7 100644 --- a/src/python/grpcio/grpc/beta/_client_adaptations.py +++ b/src/python/grpcio/grpc/beta/_client_adaptations.py @@ -117,7 +117,10 @@ class _Rendezvous(future.Future, face.Call): def exception(self, timeout=None): try: rpc_error_call = self._future.exception(timeout=timeout) - return _abortion_error(rpc_error_call) + if rpc_error_call is None: + return None + else: + return _abortion_error(rpc_error_call) except grpc.FutureTimeoutError: raise future.TimeoutError() except grpc.FutureCancelledError: |