This is an automated email from the ASF dual-hosted git repository.
tvalentyn 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 35bac6a [BEAM-7372] cleanup codes for py2 compatibility from
apache_beam/examples except for examples/snippets/*.py and examples/*.py
(#14426)
35bac6a is described below
commit 35bac6a62f1dc548ee908cfeff7f73ffcac38e6f
Author: yoshiki.obata <[email protected]>
AuthorDate: Wed Apr 7 08:42:51 2021 +0900
[BEAM-7372] cleanup codes for py2 compatibility from apache_beam/examples
except for examples/snippets/*.py and examples/*.py (#14426)
* usage of future package
* usage of past package
* unnecessary builtin import
* workarounds for py2
---
sdks/python/apache_beam/examples/complete/__init__.py | 2 --
sdks/python/apache_beam/examples/complete/autocomplete.py | 3 ---
sdks/python/apache_beam/examples/complete/autocomplete_test.py | 2 --
sdks/python/apache_beam/examples/complete/distribopt.py | 3 ---
sdks/python/apache_beam/examples/complete/distribopt_test.py | 2 --
sdks/python/apache_beam/examples/complete/estimate_pi.py | 5 -----
sdks/python/apache_beam/examples/complete/estimate_pi_test.py | 2 --
sdks/python/apache_beam/examples/complete/game/__init__.py | 2 --
sdks/python/apache_beam/examples/complete/game/game_stats.py | 4 ----
sdks/python/apache_beam/examples/complete/game/game_stats_it_test.py | 2 --
sdks/python/apache_beam/examples/complete/game/game_stats_test.py | 2 --
sdks/python/apache_beam/examples/complete/game/hourly_team_score.py | 4 ----
.../apache_beam/examples/complete/game/hourly_team_score_it_test.py | 2 --
.../apache_beam/examples/complete/game/hourly_team_score_test.py | 2 --
sdks/python/apache_beam/examples/complete/game/leader_board.py | 4 ----
.../apache_beam/examples/complete/game/leader_board_it_test.py | 3 ---
sdks/python/apache_beam/examples/complete/game/leader_board_test.py | 2 --
sdks/python/apache_beam/examples/complete/game/user_score.py | 3 ---
sdks/python/apache_beam/examples/complete/game/user_score_it_test.py | 2 --
sdks/python/apache_beam/examples/complete/game/user_score_test.py | 2 --
sdks/python/apache_beam/examples/complete/juliaset/__init__.py | 2 --
.../apache_beam/examples/complete/juliaset/juliaset/__init__.py | 2 --
.../apache_beam/examples/complete/juliaset/juliaset/juliaset.py | 4 ----
.../apache_beam/examples/complete/juliaset/juliaset/juliaset_test.py | 2 --
.../examples/complete/juliaset/juliaset/juliaset_test_it.py | 2 --
sdks/python/apache_beam/examples/complete/juliaset/juliaset_main.py | 2 --
sdks/python/apache_beam/examples/complete/juliaset/setup.py | 3 ---
sdks/python/apache_beam/examples/complete/tfidf.py | 3 ---
sdks/python/apache_beam/examples/complete/tfidf_test.py | 2 --
sdks/python/apache_beam/examples/complete/top_wikipedia_sessions.py | 2 --
.../apache_beam/examples/complete/top_wikipedia_sessions_test.py | 2 --
sdks/python/apache_beam/examples/cookbook/__init__.py | 2 --
sdks/python/apache_beam/examples/cookbook/bigquery_schema.py | 2 --
sdks/python/apache_beam/examples/cookbook/bigquery_side_input.py | 3 ---
.../python/apache_beam/examples/cookbook/bigquery_side_input_test.py | 2 --
sdks/python/apache_beam/examples/cookbook/bigquery_tornadoes.py | 2 --
.../apache_beam/examples/cookbook/bigquery_tornadoes_it_test.py | 3 ---
sdks/python/apache_beam/examples/cookbook/bigquery_tornadoes_test.py | 2 --
sdks/python/apache_beam/examples/cookbook/bigtableio_it_test.py | 2 --
sdks/python/apache_beam/examples/cookbook/coders.py | 3 ---
sdks/python/apache_beam/examples/cookbook/coders_test.py | 2 --
sdks/python/apache_beam/examples/cookbook/combiners_test.py | 2 --
sdks/python/apache_beam/examples/cookbook/custom_ptransform.py | 2 --
sdks/python/apache_beam/examples/cookbook/custom_ptransform_test.py | 2 --
sdks/python/apache_beam/examples/cookbook/datastore_wordcount.py | 4 ----
.../apache_beam/examples/cookbook/datastore_wordcount_it_test.py | 2 --
sdks/python/apache_beam/examples/cookbook/filters.py | 2 --
sdks/python/apache_beam/examples/cookbook/filters_test.py | 2 --
sdks/python/apache_beam/examples/cookbook/group_with_coder.py | 3 ---
sdks/python/apache_beam/examples/cookbook/group_with_coder_test.py | 2 --
sdks/python/apache_beam/examples/cookbook/mergecontacts.py | 3 ---
sdks/python/apache_beam/examples/cookbook/mergecontacts_test.py | 2 --
sdks/python/apache_beam/examples/cookbook/multiple_output_pardo.py | 2 --
.../apache_beam/examples/cookbook/multiple_output_pardo_test.py | 2 --
sdks/python/apache_beam/examples/flink/__init__.py | 2 --
sdks/python/apache_beam/examples/flink/flink_streaming_impulse.py | 2 --
sdks/python/apache_beam/examples/kafkataxi/__init__.py | 2 --
sdks/python/apache_beam/examples/kafkataxi/kafka_taxi.py | 2 --
58 files changed, 140 deletions(-)
diff --git a/sdks/python/apache_beam/examples/complete/__init__.py
b/sdks/python/apache_beam/examples/complete/__init__.py
index 6569e3f..cce3aca 100644
--- a/sdks/python/apache_beam/examples/complete/__init__.py
+++ b/sdks/python/apache_beam/examples/complete/__init__.py
@@ -14,5 +14,3 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
-from __future__ import absolute_import
diff --git a/sdks/python/apache_beam/examples/complete/autocomplete.py
b/sdks/python/apache_beam/examples/complete/autocomplete.py
index 54a0a10..3de8ff7 100644
--- a/sdks/python/apache_beam/examples/complete/autocomplete.py
+++ b/sdks/python/apache_beam/examples/complete/autocomplete.py
@@ -19,12 +19,9 @@
# pytype: skip-file
-from __future__ import absolute_import
-
import argparse
import logging
import re
-from builtins import range
import apache_beam as beam
from apache_beam.io import ReadFromText
diff --git a/sdks/python/apache_beam/examples/complete/autocomplete_test.py
b/sdks/python/apache_beam/examples/complete/autocomplete_test.py
index 00f3b65..4d1d892 100644
--- a/sdks/python/apache_beam/examples/complete/autocomplete_test.py
+++ b/sdks/python/apache_beam/examples/complete/autocomplete_test.py
@@ -19,8 +19,6 @@
# pytype: skip-file
-from __future__ import absolute_import
-
import unittest
from nose.plugins.attrib import attr
diff --git a/sdks/python/apache_beam/examples/complete/distribopt.py
b/sdks/python/apache_beam/examples/complete/distribopt.py
index 30324ab..fb797a0 100644
--- a/sdks/python/apache_beam/examples/complete/distribopt.py
+++ b/sdks/python/apache_beam/examples/complete/distribopt.py
@@ -51,9 +51,6 @@ The pipeline consists of three phases:
# pytype: skip-file
-from __future__ import absolute_import
-from __future__ import division
-
import argparse
import logging
import string
diff --git a/sdks/python/apache_beam/examples/complete/distribopt_test.py
b/sdks/python/apache_beam/examples/complete/distribopt_test.py
index bfd13ca..067f326 100644
--- a/sdks/python/apache_beam/examples/complete/distribopt_test.py
+++ b/sdks/python/apache_beam/examples/complete/distribopt_test.py
@@ -19,8 +19,6 @@
# pytype: skip-file
-from __future__ import absolute_import
-
import logging
import os
import tempfile
diff --git a/sdks/python/apache_beam/examples/complete/estimate_pi.py
b/sdks/python/apache_beam/examples/complete/estimate_pi.py
index 167be40..7f95989 100644
--- a/sdks/python/apache_beam/examples/complete/estimate_pi.py
+++ b/sdks/python/apache_beam/examples/complete/estimate_pi.py
@@ -26,15 +26,10 @@ we multiply our counts ratio by four to estimate π.
# pytype: skip-file
-from __future__ import absolute_import
-from __future__ import division
-
import argparse
import json
import logging
import random
-from builtins import object
-from builtins import range
from typing import Any
from typing import Iterable
from typing import Tuple
diff --git a/sdks/python/apache_beam/examples/complete/estimate_pi_test.py
b/sdks/python/apache_beam/examples/complete/estimate_pi_test.py
index 85aa772..ff224f4 100644
--- a/sdks/python/apache_beam/examples/complete/estimate_pi_test.py
+++ b/sdks/python/apache_beam/examples/complete/estimate_pi_test.py
@@ -19,8 +19,6 @@
# pytype: skip-file
-from __future__ import absolute_import
-
import logging
import unittest
diff --git a/sdks/python/apache_beam/examples/complete/game/__init__.py
b/sdks/python/apache_beam/examples/complete/game/__init__.py
index 6569e3f..cce3aca 100644
--- a/sdks/python/apache_beam/examples/complete/game/__init__.py
+++ b/sdks/python/apache_beam/examples/complete/game/__init__.py
@@ -14,5 +14,3 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
-from __future__ import absolute_import
diff --git a/sdks/python/apache_beam/examples/complete/game/game_stats.py
b/sdks/python/apache_beam/examples/complete/game/game_stats.py
index 7725f5e..e6b6e35 100644
--- a/sdks/python/apache_beam/examples/complete/game/game_stats.py
+++ b/sdks/python/apache_beam/examples/complete/game/game_stats.py
@@ -73,10 +73,6 @@ python game_stats.py \
# pytype: skip-file
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
import argparse
import csv
import logging
diff --git
a/sdks/python/apache_beam/examples/complete/game/game_stats_it_test.py
b/sdks/python/apache_beam/examples/complete/game/game_stats_it_test.py
index b2e6042..91388a4 100644
--- a/sdks/python/apache_beam/examples/complete/game/game_stats_it_test.py
+++ b/sdks/python/apache_beam/examples/complete/game/game_stats_it_test.py
@@ -33,8 +33,6 @@ Usage:
# pytype: skip-file
-from __future__ import absolute_import
-
import logging
import time
import unittest
diff --git a/sdks/python/apache_beam/examples/complete/game/game_stats_test.py
b/sdks/python/apache_beam/examples/complete/game/game_stats_test.py
index fa5d785..d085b90 100644
--- a/sdks/python/apache_beam/examples/complete/game/game_stats_test.py
+++ b/sdks/python/apache_beam/examples/complete/game/game_stats_test.py
@@ -19,8 +19,6 @@
# pytype: skip-file
-from __future__ import absolute_import
-
import logging
import unittest
diff --git
a/sdks/python/apache_beam/examples/complete/game/hourly_team_score.py
b/sdks/python/apache_beam/examples/complete/game/hourly_team_score.py
index 6913fbf..621a88c 100644
--- a/sdks/python/apache_beam/examples/complete/game/hourly_team_score.py
+++ b/sdks/python/apache_beam/examples/complete/game/hourly_team_score.py
@@ -67,10 +67,6 @@ python hourly_team_score.py \
# pytype: skip-file
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
import argparse
import csv
import logging
diff --git
a/sdks/python/apache_beam/examples/complete/game/hourly_team_score_it_test.py
b/sdks/python/apache_beam/examples/complete/game/hourly_team_score_it_test.py
index 39ed32f..f21abac 100644
---
a/sdks/python/apache_beam/examples/complete/game/hourly_team_score_it_test.py
+++
b/sdks/python/apache_beam/examples/complete/game/hourly_team_score_it_test.py
@@ -33,8 +33,6 @@ Usage:
# pytype: skip-file
-from __future__ import absolute_import
-
import logging
import unittest
diff --git
a/sdks/python/apache_beam/examples/complete/game/hourly_team_score_test.py
b/sdks/python/apache_beam/examples/complete/game/hourly_team_score_test.py
index a3d3d62..804cc84 100644
--- a/sdks/python/apache_beam/examples/complete/game/hourly_team_score_test.py
+++ b/sdks/python/apache_beam/examples/complete/game/hourly_team_score_test.py
@@ -19,8 +19,6 @@
# pytype: skip-file
-from __future__ import absolute_import
-
import logging
import unittest
diff --git a/sdks/python/apache_beam/examples/complete/game/leader_board.py
b/sdks/python/apache_beam/examples/complete/game/leader_board.py
index 406d53e..5e04d60 100644
--- a/sdks/python/apache_beam/examples/complete/game/leader_board.py
+++ b/sdks/python/apache_beam/examples/complete/game/leader_board.py
@@ -81,10 +81,6 @@ python leader_board.py \
# pytype: skip-file
-from __future__ import absolute_import
-from __future__ import division
-from __future__ import print_function
-
import argparse
import csv
import logging
diff --git
a/sdks/python/apache_beam/examples/complete/game/leader_board_it_test.py
b/sdks/python/apache_beam/examples/complete/game/leader_board_it_test.py
index 970fa1b..afbaa18 100644
--- a/sdks/python/apache_beam/examples/complete/game/leader_board_it_test.py
+++ b/sdks/python/apache_beam/examples/complete/game/leader_board_it_test.py
@@ -33,13 +33,10 @@ Usage:
# pytype: skip-file
-from __future__ import absolute_import
-
import logging
import time
import unittest
import uuid
-from builtins import range
from hamcrest.core.core.allof import all_of
from nose.plugins.attrib import attr
diff --git
a/sdks/python/apache_beam/examples/complete/game/leader_board_test.py
b/sdks/python/apache_beam/examples/complete/game/leader_board_test.py
index b527208..167ce4a 100644
--- a/sdks/python/apache_beam/examples/complete/game/leader_board_test.py
+++ b/sdks/python/apache_beam/examples/complete/game/leader_board_test.py
@@ -19,8 +19,6 @@
# pytype: skip-file
-from __future__ import absolute_import
-
import logging
import unittest
diff --git a/sdks/python/apache_beam/examples/complete/game/user_score.py
b/sdks/python/apache_beam/examples/complete/game/user_score.py
index 5d46b25..a87f221 100644
--- a/sdks/python/apache_beam/examples/complete/game/user_score.py
+++ b/sdks/python/apache_beam/examples/complete/game/user_score.py
@@ -56,9 +56,6 @@ python user_score.py \
# pytype: skip-file
-from __future__ import absolute_import
-from __future__ import division
-
import argparse
import csv
import logging
diff --git
a/sdks/python/apache_beam/examples/complete/game/user_score_it_test.py
b/sdks/python/apache_beam/examples/complete/game/user_score_it_test.py
index 8d8dcab..a2b3a17 100644
--- a/sdks/python/apache_beam/examples/complete/game/user_score_it_test.py
+++ b/sdks/python/apache_beam/examples/complete/game/user_score_it_test.py
@@ -33,8 +33,6 @@ Usage:
# pytype: skip-file
-from __future__ import absolute_import
-
import logging
import unittest
import uuid
diff --git a/sdks/python/apache_beam/examples/complete/game/user_score_test.py
b/sdks/python/apache_beam/examples/complete/game/user_score_test.py
index f72daac..2283e56 100644
--- a/sdks/python/apache_beam/examples/complete/game/user_score_test.py
+++ b/sdks/python/apache_beam/examples/complete/game/user_score_test.py
@@ -19,8 +19,6 @@
# pytype: skip-file
-from __future__ import absolute_import
-
import logging
import unittest
diff --git a/sdks/python/apache_beam/examples/complete/juliaset/__init__.py
b/sdks/python/apache_beam/examples/complete/juliaset/__init__.py
index 6569e3f..cce3aca 100644
--- a/sdks/python/apache_beam/examples/complete/juliaset/__init__.py
+++ b/sdks/python/apache_beam/examples/complete/juliaset/__init__.py
@@ -14,5 +14,3 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
-from __future__ import absolute_import
diff --git
a/sdks/python/apache_beam/examples/complete/juliaset/juliaset/__init__.py
b/sdks/python/apache_beam/examples/complete/juliaset/juliaset/__init__.py
index 6569e3f..cce3aca 100644
--- a/sdks/python/apache_beam/examples/complete/juliaset/juliaset/__init__.py
+++ b/sdks/python/apache_beam/examples/complete/juliaset/juliaset/__init__.py
@@ -14,5 +14,3 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
-from __future__ import absolute_import
diff --git
a/sdks/python/apache_beam/examples/complete/juliaset/juliaset/juliaset.py
b/sdks/python/apache_beam/examples/complete/juliaset/juliaset/juliaset.py
index dd062d1..4f98105 100644
--- a/sdks/python/apache_beam/examples/complete/juliaset/juliaset/juliaset.py
+++ b/sdks/python/apache_beam/examples/complete/juliaset/juliaset/juliaset.py
@@ -22,11 +22,7 @@ We use the quadratic polinomial f(z) = z*z + c, with c =
-.62772 +.42193i
# pytype: skip-file
-from __future__ import absolute_import
-from __future__ import division
-
import argparse
-from builtins import range
import apache_beam as beam
from apache_beam.io import WriteToText
diff --git
a/sdks/python/apache_beam/examples/complete/juliaset/juliaset/juliaset_test.py
b/sdks/python/apache_beam/examples/complete/juliaset/juliaset/juliaset_test.py
index a50280d..00a7c83 100644
---
a/sdks/python/apache_beam/examples/complete/juliaset/juliaset/juliaset_test.py
+++
b/sdks/python/apache_beam/examples/complete/juliaset/juliaset/juliaset_test.py
@@ -19,8 +19,6 @@
# pytype: skip-file
-from __future__ import absolute_import
-
import logging
import os
import re
diff --git
a/sdks/python/apache_beam/examples/complete/juliaset/juliaset/juliaset_test_it.py
b/sdks/python/apache_beam/examples/complete/juliaset/juliaset/juliaset_test_it.py
index a5ada36..9b6097b 100644
---
a/sdks/python/apache_beam/examples/complete/juliaset/juliaset/juliaset_test_it.py
+++
b/sdks/python/apache_beam/examples/complete/juliaset/juliaset/juliaset_test_it.py
@@ -19,8 +19,6 @@
# pytype: skip-file
-from __future__ import absolute_import
-
import logging
import os
import unittest
diff --git
a/sdks/python/apache_beam/examples/complete/juliaset/juliaset_main.py
b/sdks/python/apache_beam/examples/complete/juliaset/juliaset_main.py
index 4b146c3..fb64c27 100644
--- a/sdks/python/apache_beam/examples/complete/juliaset/juliaset_main.py
+++ b/sdks/python/apache_beam/examples/complete/juliaset/juliaset_main.py
@@ -50,8 +50,6 @@ python juliaset_main.py \
# pytype: skip-file
-from __future__ import absolute_import
-
import logging
from apache_beam.examples.complete.juliaset.juliaset import juliaset
diff --git a/sdks/python/apache_beam/examples/complete/juliaset/setup.py
b/sdks/python/apache_beam/examples/complete/juliaset/setup.py
index 8d06c1f..79e24b9 100644
--- a/sdks/python/apache_beam/examples/complete/juliaset/setup.py
+++ b/sdks/python/apache_beam/examples/complete/juliaset/setup.py
@@ -27,9 +27,6 @@ when running the workflow for remote execution.
# pytype: skip-file
-from __future__ import absolute_import
-from __future__ import print_function
-
import subprocess
from distutils.command.build import build as _build # type: ignore
diff --git a/sdks/python/apache_beam/examples/complete/tfidf.py
b/sdks/python/apache_beam/examples/complete/tfidf.py
index 29409f8..16ce2b8 100644
--- a/sdks/python/apache_beam/examples/complete/tfidf.py
+++ b/sdks/python/apache_beam/examples/complete/tfidf.py
@@ -23,9 +23,6 @@ http://en.wikipedia.org/wiki/Tf-idf
# pytype: skip-file
-from __future__ import absolute_import
-from __future__ import division
-
import argparse
import glob
import math
diff --git a/sdks/python/apache_beam/examples/complete/tfidf_test.py
b/sdks/python/apache_beam/examples/complete/tfidf_test.py
index ec886d4..1613ea5 100644
--- a/sdks/python/apache_beam/examples/complete/tfidf_test.py
+++ b/sdks/python/apache_beam/examples/complete/tfidf_test.py
@@ -19,8 +19,6 @@
# pytype: skip-file
-from __future__ import absolute_import
-
import logging
import os
import re
diff --git
a/sdks/python/apache_beam/examples/complete/top_wikipedia_sessions.py
b/sdks/python/apache_beam/examples/complete/top_wikipedia_sessions.py
index 20fdac0..93abe1a 100644
--- a/sdks/python/apache_beam/examples/complete/top_wikipedia_sessions.py
+++ b/sdks/python/apache_beam/examples/complete/top_wikipedia_sessions.py
@@ -42,8 +42,6 @@ be overridden with --input.
# pytype: skip-file
-from __future__ import absolute_import
-
import argparse
import json
import logging
diff --git
a/sdks/python/apache_beam/examples/complete/top_wikipedia_sessions_test.py
b/sdks/python/apache_beam/examples/complete/top_wikipedia_sessions_test.py
index 40540cb..3c17166 100644
--- a/sdks/python/apache_beam/examples/complete/top_wikipedia_sessions_test.py
+++ b/sdks/python/apache_beam/examples/complete/top_wikipedia_sessions_test.py
@@ -19,8 +19,6 @@
# pytype: skip-file
-from __future__ import absolute_import
-
import json
import unittest
diff --git a/sdks/python/apache_beam/examples/cookbook/__init__.py
b/sdks/python/apache_beam/examples/cookbook/__init__.py
index 6569e3f..cce3aca 100644
--- a/sdks/python/apache_beam/examples/cookbook/__init__.py
+++ b/sdks/python/apache_beam/examples/cookbook/__init__.py
@@ -14,5 +14,3 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
-from __future__ import absolute_import
diff --git a/sdks/python/apache_beam/examples/cookbook/bigquery_schema.py
b/sdks/python/apache_beam/examples/cookbook/bigquery_schema.py
index 74bbcc4..bf06d82 100644
--- a/sdks/python/apache_beam/examples/cookbook/bigquery_schema.py
+++ b/sdks/python/apache_beam/examples/cookbook/bigquery_schema.py
@@ -24,8 +24,6 @@ nested and repeated fields.
# pytype: skip-file
-from __future__ import absolute_import
-
import argparse
import logging
diff --git a/sdks/python/apache_beam/examples/cookbook/bigquery_side_input.py
b/sdks/python/apache_beam/examples/cookbook/bigquery_side_input.py
index 28ab7d9..6f40b14 100644
--- a/sdks/python/apache_beam/examples/cookbook/bigquery_side_input.py
+++ b/sdks/python/apache_beam/examples/cookbook/bigquery_side_input.py
@@ -29,11 +29,8 @@ a word that should be ignored when forming groups.
# pytype: skip-file
-from __future__ import absolute_import
-
import argparse
import logging
-from builtins import range
from random import randrange
import apache_beam as beam
diff --git
a/sdks/python/apache_beam/examples/cookbook/bigquery_side_input_test.py
b/sdks/python/apache_beam/examples/cookbook/bigquery_side_input_test.py
index d4320d4..ba9b61e 100644
--- a/sdks/python/apache_beam/examples/cookbook/bigquery_side_input_test.py
+++ b/sdks/python/apache_beam/examples/cookbook/bigquery_side_input_test.py
@@ -19,8 +19,6 @@
# pytype: skip-file
-from __future__ import absolute_import
-
import logging
import unittest
diff --git a/sdks/python/apache_beam/examples/cookbook/bigquery_tornadoes.py
b/sdks/python/apache_beam/examples/cookbook/bigquery_tornadoes.py
index 81d5ea8..224a2ad 100644
--- a/sdks/python/apache_beam/examples/cookbook/bigquery_tornadoes.py
+++ b/sdks/python/apache_beam/examples/cookbook/bigquery_tornadoes.py
@@ -34,8 +34,6 @@ represents table rows as plain Python dictionaries.
# pytype: skip-file
-from __future__ import absolute_import
-
import argparse
import logging
diff --git
a/sdks/python/apache_beam/examples/cookbook/bigquery_tornadoes_it_test.py
b/sdks/python/apache_beam/examples/cookbook/bigquery_tornadoes_it_test.py
index 70ff757..cfec86b 100644
--- a/sdks/python/apache_beam/examples/cookbook/bigquery_tornadoes_it_test.py
+++ b/sdks/python/apache_beam/examples/cookbook/bigquery_tornadoes_it_test.py
@@ -19,12 +19,9 @@
# pytype: skip-file
-from __future__ import absolute_import
-
import logging
import time
import unittest
-from builtins import round
from hamcrest.core.core.allof import all_of
from nose.plugins.attrib import attr
diff --git
a/sdks/python/apache_beam/examples/cookbook/bigquery_tornadoes_test.py
b/sdks/python/apache_beam/examples/cookbook/bigquery_tornadoes_test.py
index 10d6d40..e9f3f67 100644
--- a/sdks/python/apache_beam/examples/cookbook/bigquery_tornadoes_test.py
+++ b/sdks/python/apache_beam/examples/cookbook/bigquery_tornadoes_test.py
@@ -19,8 +19,6 @@
# pytype: skip-file
-from __future__ import absolute_import
-
import logging
import unittest
diff --git a/sdks/python/apache_beam/examples/cookbook/bigtableio_it_test.py
b/sdks/python/apache_beam/examples/cookbook/bigtableio_it_test.py
index 666155b..f12c945 100644
--- a/sdks/python/apache_beam/examples/cookbook/bigtableio_it_test.py
+++ b/sdks/python/apache_beam/examples/cookbook/bigtableio_it_test.py
@@ -18,8 +18,6 @@
"""Unittest for GCP Bigtable testing."""
# pytype: skip-file
-from __future__ import absolute_import
-
import datetime
import logging
import random
diff --git a/sdks/python/apache_beam/examples/cookbook/coders.py
b/sdks/python/apache_beam/examples/cookbook/coders.py
index c85110e..ff54943 100644
--- a/sdks/python/apache_beam/examples/cookbook/coders.py
+++ b/sdks/python/apache_beam/examples/cookbook/coders.py
@@ -30,12 +30,9 @@ per line in the following format:
# pytype: skip-file
-from __future__ import absolute_import
-
import argparse
import json
import logging
-from builtins import object
import apache_beam as beam
from apache_beam.io import ReadFromText
diff --git a/sdks/python/apache_beam/examples/cookbook/coders_test.py
b/sdks/python/apache_beam/examples/cookbook/coders_test.py
index 61a9280..c2325ea 100644
--- a/sdks/python/apache_beam/examples/cookbook/coders_test.py
+++ b/sdks/python/apache_beam/examples/cookbook/coders_test.py
@@ -19,8 +19,6 @@
# pytype: skip-file
-from __future__ import absolute_import
-
import logging
import unittest
diff --git a/sdks/python/apache_beam/examples/cookbook/combiners_test.py
b/sdks/python/apache_beam/examples/cookbook/combiners_test.py
index ead360f..c24f60b 100644
--- a/sdks/python/apache_beam/examples/cookbook/combiners_test.py
+++ b/sdks/python/apache_beam/examples/cookbook/combiners_test.py
@@ -25,8 +25,6 @@ checked directly on the last PCollection produced.
# pytype: skip-file
-from __future__ import absolute_import
-
import logging
import unittest
diff --git a/sdks/python/apache_beam/examples/cookbook/custom_ptransform.py
b/sdks/python/apache_beam/examples/cookbook/custom_ptransform.py
index d596e4b..4beab18 100644
--- a/sdks/python/apache_beam/examples/cookbook/custom_ptransform.py
+++ b/sdks/python/apache_beam/examples/cookbook/custom_ptransform.py
@@ -22,8 +22,6 @@ These example show the different ways you can write custom
PTransforms.
# pytype: skip-file
-from __future__ import absolute_import
-
import argparse
import logging
diff --git
a/sdks/python/apache_beam/examples/cookbook/custom_ptransform_test.py
b/sdks/python/apache_beam/examples/cookbook/custom_ptransform_test.py
index 21afc29..eb464d0 100644
--- a/sdks/python/apache_beam/examples/cookbook/custom_ptransform_test.py
+++ b/sdks/python/apache_beam/examples/cookbook/custom_ptransform_test.py
@@ -19,8 +19,6 @@
# pytype: skip-file
-from __future__ import absolute_import
-
import logging
import unittest
diff --git a/sdks/python/apache_beam/examples/cookbook/datastore_wordcount.py
b/sdks/python/apache_beam/examples/cookbook/datastore_wordcount.py
index 39c76ca..c893a2c 100644
--- a/sdks/python/apache_beam/examples/cookbook/datastore_wordcount.py
+++ b/sdks/python/apache_beam/examples/cookbook/datastore_wordcount.py
@@ -55,9 +55,6 @@ The following options must be provided to run this pipeline
in read-write mode:
# pytype: skip-file
-from __future__ import absolute_import
-from __future__ import print_function
-
import argparse
import logging
import re
@@ -66,7 +63,6 @@ from typing import Iterable
from typing import Optional
from typing import Text
import uuid
-from builtins import object
import apache_beam as beam
from apache_beam.io import ReadFromText
diff --git
a/sdks/python/apache_beam/examples/cookbook/datastore_wordcount_it_test.py
b/sdks/python/apache_beam/examples/cookbook/datastore_wordcount_it_test.py
index 0cff4c4..36f81bd 100644
--- a/sdks/python/apache_beam/examples/cookbook/datastore_wordcount_it_test.py
+++ b/sdks/python/apache_beam/examples/cookbook/datastore_wordcount_it_test.py
@@ -19,8 +19,6 @@
# pytype: skip-file
-from __future__ import absolute_import
-
import logging
import time
import unittest
diff --git a/sdks/python/apache_beam/examples/cookbook/filters.py
b/sdks/python/apache_beam/examples/cookbook/filters.py
index 9381234..fda0706 100644
--- a/sdks/python/apache_beam/examples/cookbook/filters.py
+++ b/sdks/python/apache_beam/examples/cookbook/filters.py
@@ -26,8 +26,6 @@
# pytype: skip-file
-from __future__ import absolute_import
-
import argparse
import logging
diff --git a/sdks/python/apache_beam/examples/cookbook/filters_test.py
b/sdks/python/apache_beam/examples/cookbook/filters_test.py
index 477fc7e..a75253e 100644
--- a/sdks/python/apache_beam/examples/cookbook/filters_test.py
+++ b/sdks/python/apache_beam/examples/cookbook/filters_test.py
@@ -19,8 +19,6 @@
# pytype: skip-file
-from __future__ import absolute_import
-
import logging
import unittest
diff --git a/sdks/python/apache_beam/examples/cookbook/group_with_coder.py
b/sdks/python/apache_beam/examples/cookbook/group_with_coder.py
index 2249ec6..3ce7836 100644
--- a/sdks/python/apache_beam/examples/cookbook/group_with_coder.py
+++ b/sdks/python/apache_beam/examples/cookbook/group_with_coder.py
@@ -27,13 +27,10 @@ and score.
# pytype: skip-file
-from __future__ import absolute_import
-
import argparse
import logging
import sys
import typing
-from builtins import object
import apache_beam as beam
from apache_beam import coders
diff --git a/sdks/python/apache_beam/examples/cookbook/group_with_coder_test.py
b/sdks/python/apache_beam/examples/cookbook/group_with_coder_test.py
index 8bac55b..e29807f 100644
--- a/sdks/python/apache_beam/examples/cookbook/group_with_coder_test.py
+++ b/sdks/python/apache_beam/examples/cookbook/group_with_coder_test.py
@@ -19,8 +19,6 @@
# pytype: skip-file
-from __future__ import absolute_import
-
import logging
import tempfile
import unittest
diff --git a/sdks/python/apache_beam/examples/cookbook/mergecontacts.py
b/sdks/python/apache_beam/examples/cookbook/mergecontacts.py
index 2c0780c..81df530 100644
--- a/sdks/python/apache_beam/examples/cookbook/mergecontacts.py
+++ b/sdks/python/apache_beam/examples/cookbook/mergecontacts.py
@@ -31,12 +31,9 @@ A demonstration of:
# pytype: skip-file
-from __future__ import absolute_import
-
import argparse
import logging
import re
-from builtins import next
import apache_beam as beam
from apache_beam.io import ReadFromText
diff --git a/sdks/python/apache_beam/examples/cookbook/mergecontacts_test.py
b/sdks/python/apache_beam/examples/cookbook/mergecontacts_test.py
index adb81e7..72291fc 100644
--- a/sdks/python/apache_beam/examples/cookbook/mergecontacts_test.py
+++ b/sdks/python/apache_beam/examples/cookbook/mergecontacts_test.py
@@ -19,8 +19,6 @@
# pytype: skip-file
-from __future__ import absolute_import
-
import logging
import tempfile
import unittest
diff --git a/sdks/python/apache_beam/examples/cookbook/multiple_output_pardo.py
b/sdks/python/apache_beam/examples/cookbook/multiple_output_pardo.py
index 5f4e557..1dde20a 100644
--- a/sdks/python/apache_beam/examples/cookbook/multiple_output_pardo.py
+++ b/sdks/python/apache_beam/examples/cookbook/multiple_output_pardo.py
@@ -51,8 +51,6 @@ and an output prefix on GCS:::
# pytype: skip-file
-from __future__ import absolute_import
-
import argparse
import logging
import re
diff --git
a/sdks/python/apache_beam/examples/cookbook/multiple_output_pardo_test.py
b/sdks/python/apache_beam/examples/cookbook/multiple_output_pardo_test.py
index 676050e..e811aac 100644
--- a/sdks/python/apache_beam/examples/cookbook/multiple_output_pardo_test.py
+++ b/sdks/python/apache_beam/examples/cookbook/multiple_output_pardo_test.py
@@ -19,8 +19,6 @@
# pytype: skip-file
-from __future__ import absolute_import
-
import logging
import re
import tempfile
diff --git a/sdks/python/apache_beam/examples/flink/__init__.py
b/sdks/python/apache_beam/examples/flink/__init__.py
index 6569e3f..cce3aca 100644
--- a/sdks/python/apache_beam/examples/flink/__init__.py
+++ b/sdks/python/apache_beam/examples/flink/__init__.py
@@ -14,5 +14,3 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
-from __future__ import absolute_import
diff --git a/sdks/python/apache_beam/examples/flink/flink_streaming_impulse.py
b/sdks/python/apache_beam/examples/flink/flink_streaming_impulse.py
index f211c55..badf401 100644
--- a/sdks/python/apache_beam/examples/flink/flink_streaming_impulse.py
+++ b/sdks/python/apache_beam/examples/flink/flink_streaming_impulse.py
@@ -22,8 +22,6 @@ This can only be used with the Flink portable runner.
# pytype: skip-file
-from __future__ import absolute_import
-
import argparse
import logging
import sys
diff --git a/sdks/python/apache_beam/examples/kafkataxi/__init__.py
b/sdks/python/apache_beam/examples/kafkataxi/__init__.py
index 6569e3f..cce3aca 100644
--- a/sdks/python/apache_beam/examples/kafkataxi/__init__.py
+++ b/sdks/python/apache_beam/examples/kafkataxi/__init__.py
@@ -14,5 +14,3 @@
# See the License for the specific language governing permissions and
# limitations under the License.
#
-
-from __future__ import absolute_import
diff --git a/sdks/python/apache_beam/examples/kafkataxi/kafka_taxi.py
b/sdks/python/apache_beam/examples/kafkataxi/kafka_taxi.py
index f1fc646..5cbf388 100644
--- a/sdks/python/apache_beam/examples/kafkataxi/kafka_taxi.py
+++ b/sdks/python/apache_beam/examples/kafkataxi/kafka_taxi.py
@@ -24,8 +24,6 @@
# pytype: skip-file
-from __future__ import absolute_import
-
import logging
import typing
