From 1c728b3aea072d76f10af88542f5ec73d6080e2a Mon Sep 17 00:00:00 2001 From: Lidi Zheng Date: Fri, 17 Apr 2020 13:12:08 -0700 Subject: [PATCH] Reduce maintenance burden --- .../grpcio_status/grpc_status/rpc_status.py | 16 ++++++---------- .../tests_aio/status/grpc_status_test.py | 4 ++-- 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/python/grpcio_status/grpc_status/rpc_status.py b/src/python/grpcio_status/grpc_status/rpc_status.py index d2bbbae4343..f3c94cc5039 100644 --- a/src/python/grpcio_status/grpc_status/rpc_status.py +++ b/src/python/grpcio_status/grpc_status/rpc_status.py @@ -79,15 +79,11 @@ def to_status(status): status.SerializeToString()),)) +__all__ = [ + 'from_call', + 'to_status', +] + if sys.version_info[0] >= 3 and sys.version_info[1] >= 6: from . import _async as aio - __all__ = [ - 'from_call', - 'to_status', - 'aio', - ] -else: - __all__ = [ - 'from_call', - 'to_status', - ] + __all__.append('aio') diff --git a/src/python/grpcio_tests/tests_aio/status/grpc_status_test.py b/src/python/grpcio_tests/tests_aio/status/grpc_status_test.py index b3b894d1161..980cf5a67e7 100644 --- a/src/python/grpcio_tests/tests_aio/status/grpc_status_test.py +++ b/src/python/grpcio_tests/tests_aio/status/grpc_status_test.py @@ -144,8 +144,8 @@ class StatusTest(AioTestBase): self.assertEqual(status.code, code_pb2.Code.Value('INTERNAL')) # Check if the underlying proto message is intact - self.assertEqual( - status.details[0].Is(error_details_pb2.DebugInfo.DESCRIPTOR), True) + self.assertTrue(status.details[0].Is( + error_details_pb2.DebugInfo.DESCRIPTOR)) info = error_details_pb2.DebugInfo() status.details[0].Unpack(info) self.assertIn('_error_details_unary_unary', info.stack_entries[-1])