linting, various fixes

Author: jrmccluskey

sdks/python/apache_beam/runners/dataflow/dataflow_metrics.py

@@ -202,14 +202,10 @@ def _get_metric_value(self, metric):
     if metric is None:
       return None
 
-    print("Scalar: ", metric.scalar)
-    print("Distribution: ", metric.distribution)
     if metric.scalar is not None:
       # This will always be a single value if there is any data in the field.
-      print("Treating as scalar: ", metric.scalar)
       return metric.scalar
     elif metric.distribution is not None:
-      print("Treating as distribution: ", metric.distribution)
       dist_count = metric.distribution['count']
       dist_min = metric.distribution['min']
       dist_max = metric.distribution['max']

sdks/python/apache_beam/runners/dataflow/dataflow_metrics_test.py

@@ -48,8 +48,9 @@
 # Protect against environments where apitools library is not available.
 # pylint: disable=wrong-import-order, wrong-import-position
 try:
-  from apache_beam.runners.dataflow.internal import apiclient
   from google.cloud import dataflow
+
+  from apache_beam.runners.dataflow.internal import apiclient
 except ImportError:
   apiclient = None  # type: ignore
   dataflow = None  # type: ignore

sdks/python/apache_beam/runners/dataflow/dataflow_runner_test.py

@@ -52,8 +52,9 @@
 # Protect against environments where apitools library is not available.
 # pylint: disable=wrong-import-order, wrong-import-position
 try:
-  from apache_beam.runners.dataflow.internal import apiclient
   from google.cloud import dataflow as dataflow_api
+
+  from apache_beam.runners.dataflow.internal import apiclient
 except ImportError:
   apiclient = None  # type: ignore
   dataflow_api = None  # type: ignore

sdks/python/apache_beam/runners/dataflow/internal/apiclient_test.py

@@ -39,7 +39,6 @@
 from apache_beam.portability.api import beam_runner_api_pb2
 from apache_beam.runners.dataflow.internal import names
 from apache_beam.transforms import Create
-# from apache_beam.transforms import DataflowDistributionCounter
 from apache_beam.transforms import DoFn
 from apache_beam.transforms import ParDo
 from apache_beam.transforms.environments import DockerEnvironment
@@ -48,8 +47,9 @@
 # Protect against environments where apitools library is not available.
 # pylint: disable=wrong-import-order, wrong-import-position, ungrouped-imports
 try:
-  from apache_beam.runners.dataflow.internal import apiclient
   from google.cloud import dataflow
+
+  from apache_beam.runners.dataflow.internal import apiclient
 except ImportError:
   apiclient = None  # type: ignore
   dataflow = None  # type: ignore