This is an automated email from the ASF dual-hosted git repository.
lcwik pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new 32f03f9 More guarding against missing grpc.
new 6eb8605 Merge pull request #9645 from robertwb/no-grpc
32f03f9 is described below
commit 32f03f969aa82da2ebecd9edb5ca4a630f32aa47
Author: Robert Bradshaw <rober...@gmail.com>
AuthorDate: Mon Sep 23 17:15:19 2019 -0700
More guarding against missing grpc.
---
sdks/python/apache_beam/transforms/external.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sdks/python/apache_beam/transforms/external.py
b/sdks/python/apache_beam/transforms/external.py
index 0e241b7..75fe766 100644
--- a/sdks/python/apache_beam/transforms/external.py
+++ b/sdks/python/apache_beam/transforms/external.py
@@ -39,13 +39,13 @@ from apache_beam.typehints.native_type_compatibility import
convert_to_beam_type
from apache_beam.typehints.trivial_inference import instance_to_type
from apache_beam.typehints.typehints import Union
from apache_beam.typehints.typehints import UnionConstraint
-from apache_beam.utils import subprocess_server
# Protect against environments where grpc is not available.
# pylint: disable=wrong-import-order, wrong-import-position, ungrouped-imports
try:
import grpc
from apache_beam.portability.api import beam_expansion_api_pb2_grpc
+ from apache_beam.utils import subprocess_server
except ImportError:
grpc = None
# pylint: enable=wrong-import-order, wrong-import-position, ungrouped-imports
