Address issues with a few missing modules/objects

apache · pabloem · Dec 11, 2019 · Oct 8, 2019 · Sep 9, 2019 · Sep 9, 2019
commit 70f06ed70dca61f0482fb0af17f7b7f1b90e72d3
diff --git a/sdks/python/apache_beam/options/pipeline_options.py b/sdks/python/apache_beam/options/pipeline_options.py
@@ -187,7 +187,7 @@ def __init__(self, flags=None, **kwargs):
       if cls == PipelineOptions:
         break
       elif '_add_argparse_args' in cls.__dict__:
-        cls._add_argparse_args(parser)
+        cls._add_argparse_args(parser)  # type: ignore
 
     # The _visible_options attribute will contain options that were recognized
     # by the parser.

diff --git a/sdks/python/apache_beam/pvalue.py b/sdks/python/apache_beam/pvalue.py
@@ -237,7 +237,7 @@ def __getattr__(self, tag):
     # Special methods which may be accessed before the object is
     # fully constructed (e.g. in unpickling).
     if tag[:2] == tag[-2:] == '__':
-      return object.__getattr__(self, tag)
+      return object.__getattr__(self, tag)  # type: ignore
     return self[tag]
 
   def __getitem__(self, tag):

diff --git a/sdks/python/apache_beam/runners/interactive/display/display_manager.py b/sdks/python/apache_beam/runners/interactive/display/display_manager.py
@@ -27,6 +27,7 @@
 import collections
 import threading
 import time
+import typing
 
 from apache_beam.runners.interactive.display import interactive_pipeline_graph
 
@@ -37,11 +38,12 @@
   # _display_progress defines how outputs are printed on the frontend.
   _display_progress = ip_display
 
-  def _formatter(string, pp, cycle):  # pylint: disable=unused-argument
-    pp.text(string)
-  if get_ipython():
-    plain = get_ipython().display_formatter.formatters['text/plain']  # pylint: disable=undefined-variable
-    plain.for_type(str, _formatter)
+  if not typing.TYPE_CHECKING:
+    def _formatter(string, pp, cycle):  # pylint: disable=unused-argument
+      pp.text(string)
+    if get_ipython():
+      plain = get_ipython().display_formatter.formatters['text/plain']  # pylint: disable=undefined-variable
+      plain.for_type(str, _formatter)
 
 except ImportError:
   IPython = None

diff --git a/sdks/python/apache_beam/runners/portability/local_job_service.py b/sdks/python/apache_beam/runners/portability/local_job_service.py
@@ -28,7 +28,7 @@
 from builtins import object
 
 import grpc
-from google.protobuf import text_format
+from google.protobuf import text_format  # type: ignore # not in typeshed
 
 from apache_beam.metrics import monitoring_infos
 from apache_beam.portability.api import beam_artifact_api_pb2

diff --git a/sdks/python/apache_beam/runners/worker/sdk_worker_main.py b/sdks/python/apache_beam/runners/worker/sdk_worker_main.py
@@ -28,7 +28,7 @@
 import traceback
 from builtins import object
 
-from google.protobuf import text_format
+from google.protobuf import text_format  # type: ignore # not in typeshed
 
 from apache_beam.internal import pickler
 from apache_beam.options.pipeline_options import DebugOptions

diff --git a/sdks/python/apache_beam/runners/worker/statesampler.py b/sdks/python/apache_beam/runners/worker/statesampler.py
@@ -29,7 +29,7 @@
 from apache_beam.utils.counters import CounterName
 
 try:
-  from apache_beam.runners.worker import statesampler_fast as statesampler_impl
+  from apache_beam.runners.worker import statesampler_fast as statesampler_impl  # type: ignore
   FAST_SAMPLER = True
 except ImportError:
   from apache_beam.runners.worker import statesampler_slow as statesampler_impl

diff --git a/sdks/python/apache_beam/typehints/decorators.py b/sdks/python/apache_beam/typehints/decorators.py
@@ -605,7 +605,7 @@ def get_type_hints(fn):
       hints = IOTypeHints()
       # Python 3.7 introduces annotations for _MethodDescriptorTypes.
       if isinstance(fn, _MethodDescriptorType) and sys.version_info < (3, 7):
-        hints.set_input_types(fn.__objclass__)
+        hints.set_input_types(fn.__objclass__)  # type: ignore
       return hints
   return fn._type_hints
   # pylint: enable=protected-access

diff --git a/sdks/python/apache_beam/typehints/trivial_inference.py b/sdks/python/apache_beam/typehints/trivial_inference.py
@@ -40,7 +40,7 @@
 try:                  # Python 2
   import __builtin__ as builtins
 except ImportError:   # Python 3
-  import builtins
+  import builtins  # type: ignore
 # pylint: enable=wrong-import-order, wrong-import-position, ungrouped-imports