[BEAM-1251] Replace NameError-driven dispatch with past

sdks/python/apache_beam/coders/coder_impl.py

@@ -37,6 +37,9 @@
 from builtins import chr
 from builtins import object
 
+from past.builtins import long
+from past.builtins import unicode
+
 from apache_beam.coders import observable
 from apache_beam.utils import windowed_value
 from apache_beam.utils.timestamp import MAX_TIMESTAMP
@@ -61,13 +64,6 @@
   from .slow_stream import get_varint_size
 # pylint: enable=wrong-import-order, wrong-import-position, ungrouped-imports
 
-try:                # Python 2
-  long              # pylint: disable=long-builtin
-  unicode           # pylint: disable=unicode-builtin
-except NameError:   # Python 3
-  long = int
-  unicode = str
-
 
 class CoderImpl(object):
   """For internal use only; no backwards-compatibility guarantees."""

sdks/python/apache_beam/coders/coders.py

@@ -24,21 +24,15 @@
 import base64
 from builtins import object
 
-import google.protobuf
-from google.protobuf import wrappers_pb2
+import google.protobuf.wrappers_pb2
+from future.moves import pickle
 
 from apache_beam.coders import coder_impl
 from apache_beam.portability import common_urns
 from apache_beam.portability import python_urns
 from apache_beam.portability.api import beam_runner_api_pb2
 from apache_beam.utils import proto_utils
 
-# This is for py2/3 compatibility. cPickle was renamed pickle in python 3.
-try:
-  import cPickle as pickle # Python 2
-except ImportError:
-  import pickle # Python 3
-
 # pylint: disable=wrong-import-order, wrong-import-position, ungrouped-imports
 try:
   from .stream import get_varint_size
@@ -277,7 +271,7 @@ def from_runner_api(cls, coder_proto, context):
   def to_runner_api_parameter(self, context):
     return (
         python_urns.PICKLED_CODER,
-        wrappers_pb2.BytesValue(value=serialize_coder(self)),
+        google.protobuf.wrappers_pb2.BytesValue(value=serialize_coder(self)),
         ())
 
   @staticmethod

sdks/python/apache_beam/coders/typecoders.py

@@ -67,14 +67,11 @@ def MakeXyzs(v):
 
 from builtins import object
 
+from past.builtins import unicode
+
 from apache_beam.coders import coders
 from apache_beam.typehints import typehints
 
-try:
-  unicode           # pylint: disable=unicode-builtin
-except NameError:
-  unicode = str
-
 __all__ = ['registry']
 
 

sdks/python/apache_beam/examples/cookbook/datastore_wordcount.py

@@ -73,6 +73,7 @@
 from google.cloud.proto.datastore.v1 import query_pb2
 from googledatastore import helper as datastore_helper
 from googledatastore import PropertyFilter
+from past.builtins import unicode
 
 import apache_beam as beam
 from apache_beam.io import ReadFromText
@@ -83,11 +84,6 @@
 from apache_beam.options.pipeline_options import PipelineOptions
 from apache_beam.options.pipeline_options import SetupOptions
 
-try:
-  unicode           # pylint: disable=unicode-builtin
-except NameError:
-  unicode = str
-
 
 class WordExtractingDoFn(beam.DoFn):
   """Parse each line of input text into words."""

sdks/python/apache_beam/examples/snippets/snippets.py

@@ -36,6 +36,8 @@
 from builtins import object
 from builtins import range
 
+from past.builtins import unicode
+
 import apache_beam as beam
 from apache_beam.io import iobase
 from apache_beam.io.range_trackers import OffsetRangeTracker
@@ -55,11 +57,6 @@
 # pylint:disable=unused-variable
 # pylint:disable=wrong-import-order, wrong-import-position
 
-try:
-  unicode           # pylint: disable=unicode-builtin
-except NameError:
-  unicode = str
-
 
 class SnippetUtils(object):
   from apache_beam.pipeline import PipelineVisitor

sdks/python/apache_beam/examples/streaming_wordcount.py

@@ -23,18 +23,15 @@
 import argparse
 import logging
 
+from past.builtins import unicode
+
 import apache_beam as beam
 import apache_beam.transforms.window as window
 from apache_beam.examples.wordcount import WordExtractingDoFn
 from apache_beam.options.pipeline_options import PipelineOptions
 from apache_beam.options.pipeline_options import SetupOptions
 from apache_beam.options.pipeline_options import StandardOptions
 
-try:
-  unicode           # pylint: disable=unicode-builtin
-except NameError:
-  unicode = str
-
 
 def run(argv=None):
   """Build and run the pipeline."""

sdks/python/apache_beam/examples/streaming_wordcount_debugging.py

@@ -38,6 +38,8 @@
 import logging
 import re
 
+from past.builtins import unicode
+
 import apache_beam as beam
 import apache_beam.transforms.window as window
 from apache_beam.examples.wordcount import WordExtractingDoFn
@@ -48,11 +50,6 @@
 from apache_beam.testing.util import equal_to_per_window
 from apache_beam.transforms.core import ParDo
 
-try:
-  unicode           # pylint: disable=unicode-builtin
-except NameError:
-  unicode = str
-
 
 class PrintFn(beam.DoFn):
   """A DoFn that prints label, element, its window, and its timstamp. """

sdks/python/apache_beam/examples/windowed_wordcount.py

@@ -26,14 +26,11 @@
 import argparse
 import logging
 
+from past.builtins import unicode
+
 import apache_beam as beam
 import apache_beam.transforms.window as window
 
-try:
-  unicode           # pylint: disable=unicode-builtin
-except NameError:
-  unicode = str
-
 TABLE_SCHEMA = ('word:STRING, count:INTEGER, '
                 'window_start:TIMESTAMP, window_end:TIMESTAMP')
 

sdks/python/apache_beam/examples/wordcount.py

@@ -23,6 +23,8 @@
 import logging
 import re
 
+from past.builtins import unicode
+
 import apache_beam as beam
 from apache_beam.io import ReadFromText
 from apache_beam.io import WriteToText
@@ -31,11 +33,6 @@
 from apache_beam.options.pipeline_options import PipelineOptions
 from apache_beam.options.pipeline_options import SetupOptions
 
-try:
-  unicode           # pylint: disable=unicode-builtin
-except NameError:
-  unicode = str
-
 
 class WordExtractingDoFn(beam.DoFn):
   """Parse each line of input text into words."""

sdks/python/apache_beam/examples/wordcount_debugging.py

@@ -45,6 +45,8 @@
 import logging
 import re
 
+from past.builtins import unicode
+
 import apache_beam as beam
 from apache_beam.io import ReadFromText
 from apache_beam.io import WriteToText
@@ -54,11 +56,6 @@
 from apache_beam.testing.util import assert_that
 from apache_beam.testing.util import equal_to
 
-try:
-  unicode           # pylint: disable=unicode-builtin
-except NameError:
-  unicode = str
-
 
 class FilterTextFn(beam.DoFn):
   """A DoFn that filters for a specific key based on a regular expression."""

sdks/python/apache_beam/examples/wordcount_fnapi.py

@@ -28,6 +28,8 @@
 import logging
 import re
 
+from past.builtins import unicode
+
 import apache_beam as beam
 from apache_beam.io import ReadFromText
 # TODO(BEAM-2887): Enable after the issue is fixed.
@@ -38,11 +40,6 @@
 from apache_beam.options.pipeline_options import PipelineOptions
 from apache_beam.options.pipeline_options import SetupOptions
 
-try:
-  unicode           # pylint: disable=unicode-builtin
-except NameError:
-  unicode = str
-
 
 class WordExtractingDoFn(beam.DoFn):
   """Parse each line of input text into words."""

sdks/python/apache_beam/examples/wordcount_minimal.py

@@ -50,17 +50,14 @@
 import logging
 import re
 
+from past.builtins import unicode
+
 import apache_beam as beam
 from apache_beam.io import ReadFromText
 from apache_beam.io import WriteToText
 from apache_beam.options.pipeline_options import PipelineOptions
 from apache_beam.options.pipeline_options import SetupOptions
 
-try:
-  unicode           # pylint: disable=unicode-builtin
-except NameError:
-  unicode = str
-
 
 def run(argv=None):
   """Main entry point; defines and runs the wordcount pipeline."""

sdks/python/apache_beam/internal/gcp/json_value.py

@@ -19,6 +19,9 @@
 
 from __future__ import absolute_import
 
+from past.builtins import long
+from past.builtins import unicode
+
 from apache_beam.options.value_provider import ValueProvider
 
 # Protect against environments where apitools library is not available.
@@ -29,12 +32,6 @@
   extra_types = None
 # pylint: enable=wrong-import-order, wrong-import-position
 
-try:              # Python 2
-  unicode         # pylint: disable=unicode-builtin
-  long            # pylint: disable=long-builtin
-except NameError: # Python 3
-  unicode = str
-  long = int
 
 _MAXINT64 = (1 << 63) - 1
 _MININT64 = - (1 << 63)

sdks/python/apache_beam/io/filebasedsink.py

@@ -28,6 +28,7 @@
 from builtins import zip
 
 from future.utils import iteritems
+from past.builtins import unicode
 
 from apache_beam.internal import util
 from apache_beam.io import iobase
@@ -43,11 +44,6 @@
 
 __all__ = ['FileBasedSink']
 
-try:
-  unicode           # pylint: disable=unicode-builtin
-except NameError:
-  unicode = str
-
 
 class FileBasedSink(iobase.Sink):
   """A sink to a GCS or local files.

sdks/python/apache_beam/io/filesystem.py

@@ -39,6 +39,8 @@
 
 from future import standard_library
 from future.utils import with_metaclass
+from past.builtins import long
+from past.builtins import unicode
 
 from apache_beam.utils.plugin import BeamPlugin
 
@@ -51,13 +53,6 @@
 __all__ = ['CompressionTypes', 'CompressedFile', 'FileMetadata', 'FileSystem',
            'MatchResult']
 
-try:
-  unicode       # pylint: disable=unicode-builtin
-  long          # pylint: disable=long-builtin
-except NameError:
-  unicode = str
-  long = int
-
 
 class CompressionTypes(object):
   """Enum-like class representing known compression types."""

sdks/python/apache_beam/io/filesystems.py

@@ -22,6 +22,8 @@
 import re
 from builtins import object
 
+from past.builtins import unicode
+
 from apache_beam.io.filesystem import BeamIOError
 from apache_beam.io.filesystem import CompressionTypes
 from apache_beam.io.filesystem import FileSystem
@@ -48,10 +50,6 @@
 except ImportError:
   pass
 
-try:
-  unicode           # pylint: disable=unicode-builtin
-except NameError:
-  unicode = str
 
 # pylint: enable=wrong-import-position, unused-import
 

sdks/python/apache_beam/io/gcp/bigquery.py

@@ -124,6 +124,7 @@
 
 from future.utils import iteritems
 from future.utils import itervalues
+from past.builtins import unicode
 
 from apache_beam import coders
 from apache_beam.internal.gcp import auth
@@ -146,10 +147,6 @@
   pass
 # pylint: enable=wrong-import-order, wrong-import-position
 
-try:
-  unicode           # pylint: disable=unicode-builtin
-except NameError:
-  unicode = str
 
 __all__ = [
     'TableRowJsonCoder',

sdks/python/apache_beam/io/range_trackers.py

@@ -24,16 +24,13 @@
 import math
 import threading
 
+from past.builtins import long
+
 from apache_beam.io import iobase
 
 __all__ = ['OffsetRangeTracker', 'LexicographicKeyRangeTracker',
            'OrderedPositionRangeTracker', 'UnsplittableRangeTracker']
 
-try:
-  long  # pylint: disable=long-builtin
-except NameError:
-  long = int
-
 
 class OffsetRangeTracker(iobase.RangeTracker):
   """A 'RangeTracker' for non-negative positions of type 'long'."""

sdks/python/apache_beam/io/range_trackers_test.py

@@ -24,12 +24,9 @@
 import math
 import unittest
 
-from apache_beam.io import range_trackers
+from past.builtins import long
 
-try:
-  long  # pylint: disable=long-builtin
-except NameError:
-  long = int
+from apache_beam.io import range_trackers
 
 
 class OffsetRangeTrackerTest(unittest.TestCase):