chore: remove other Python 2.7 workarounds

Author: tseaver

google/api_core/gapic_v1/__init__.py

@@ -12,17 +12,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
-
 from google.api_core.gapic_v1 import client_info
 from google.api_core.gapic_v1 import config
+from google.api_core.gapic_v1 import config_async
 from google.api_core.gapic_v1 import method
+from google.api_core.gapic_v1 import method_async
 from google.api_core.gapic_v1 import routing_header
 
-__all__ = ["client_info", "config", "method", "routing_header"]
-
-if sys.version_info >= (3, 6):
-    from google.api_core.gapic_v1 import config_async  # noqa: F401
-    from google.api_core.gapic_v1 import method_async  # noqa: F401
-    __all__.append("config_async")
-    __all__.append("method_async")
+__all__ = [
+    "client_info",
+    "config",
+    "config_async",
+    "method",
+    "method_async",
+    "routing_header",
+]

google/api_core/gapic_v1/routing_header.py

@@ -20,7 +20,6 @@
 Generally, these headers are specified as gRPC metadata.
 """
 
-import sys
 from urllib.parse import urlencode
 
 ROUTING_METADATA_KEY = "x-goog-request-params"
@@ -36,9 +35,6 @@ def to_routing_header(params):
     Returns:
         str: The routing header string.
     """
-    if sys.version_info[0] < 3:
-        # Python 2 does not have the "safe" parameter for urlencode.
-        return urlencode(params).replace("%2F", "/")
     return urlencode(
         params,
         # Per Google API policy (go/api-url-encoding), / is not encoded.

google/api_core/iam.py

@@ -52,14 +52,10 @@
 """
 
 import collections
+import collections.abc
 import operator
 import warnings
 
-try:
-    from collections import abc as collections_abc
-except ImportError:  # Python 2.7
-    import collections as collections_abc
-
 # Generic IAM roles
 
 OWNER_ROLE = "roles/owner"
@@ -87,7 +83,7 @@ class InvalidOperationException(Exception):
     pass
 
 
-class Policy(collections_abc.MutableMapping):
+class Policy(collections.abc.MutableMapping):
     """IAM Policy
 
     Args:
@@ -450,10 +446,7 @@ def to_api_repr(self):
             for binding in self._bindings:
                 members = binding.get("members")
                 if members:
-                    new_binding = {
-                        "role": binding["role"],
-                        "members": sorted(members)
-                    }
+                    new_binding = {"role": binding["role"], "members": sorted(members)}
                     condition = binding.get("condition")
                     if condition:
                         new_binding["condition"] = condition

google/api_core/operations_v1/__init__.py

@@ -14,11 +14,7 @@
 
 """Package for interacting with the google.longrunning.operations meta-API."""
 
-import sys
-
+from google.api_core.operations_v1.operations_async_client import OperationsAsyncClient
 from google.api_core.operations_v1.operations_client import OperationsClient
 
-__all__ = ["OperationsClient"]
-if sys.version_info >= (3, 6, 0):
-    from google.api_core.operations_v1.operations_async_client import OperationsAsyncClient  # noqa: F401
-    __all__.append("OperationsAsyncClient")
+__all__ = ["OperationsAsyncClient", "OperationsClient"]

google/api_core/protobuf_helpers.py

@@ -15,18 +15,14 @@
 """Helpers for :mod:`protobuf`."""
 
 import collections
+import collections.abc
 import copy
 import inspect
 
 from google.protobuf import field_mask_pb2
 from google.protobuf import message
 from google.protobuf import wrappers_pb2
 
-try:
-    from collections import abc as collections_abc
-except ImportError:  # Python 2.7
-    import collections as collections_abc
-
 
 _SENTINEL = object()
 _WRAPPER_TYPES = (
@@ -179,7 +175,7 @@ def get(msg_or_dict, key, default=_SENTINEL):
     # If we get something else, complain.
     if isinstance(msg_or_dict, message.Message):
         answer = getattr(msg_or_dict, key, default)
-    elif isinstance(msg_or_dict, collections_abc.Mapping):
+    elif isinstance(msg_or_dict, collections.abc.Mapping):
         answer = msg_or_dict.get(key, default)
     else:
         raise TypeError(
@@ -204,21 +200,21 @@ def _set_field_on_message(msg, key, value):
     """Set helper for protobuf Messages."""
     # Attempt to set the value on the types of objects we know how to deal
     # with.
-    if isinstance(value, (collections_abc.MutableSequence, tuple)):
+    if isinstance(value, (collections.abc.MutableSequence, tuple)):
         # Clear the existing repeated protobuf message of any elements
         # currently inside it.
         while getattr(msg, key):
             getattr(msg, key).pop()
 
         # Write our new elements to the repeated field.
         for item in value:
-            if isinstance(item, collections_abc.Mapping):
+            if isinstance(item, collections.abc.Mapping):
                 getattr(msg, key).add(**item)
             else:
                 # protobuf's RepeatedCompositeContainer doesn't support
                 # append.
                 getattr(msg, key).extend([item])
-    elif isinstance(value, collections_abc.Mapping):
+    elif isinstance(value, collections.abc.Mapping):
         # Assign the dictionary values to the protobuf message.
         for item_key, item_value in value.items():
             set(getattr(msg, key), item_key, item_value)
@@ -241,7 +237,7 @@ def set(msg_or_dict, key, value):
         TypeError: If ``msg_or_dict`` is not a Message or dictionary.
     """
     # Sanity check: Is our target object valid?
-    if not isinstance(msg_or_dict, (collections_abc.MutableMapping, message.Message)):
+    if not isinstance(msg_or_dict, (collections.abc.MutableMapping, message.Message)):
         raise TypeError(
             "set() expected a dict or protobuf message, got {!r}.".format(
                 type(msg_or_dict)
@@ -254,12 +250,12 @@ def set(msg_or_dict, key, value):
     # If a subkey exists, then get that object and call this method
     # recursively against it using the subkey.
     if subkey is not None:
-        if isinstance(msg_or_dict, collections_abc.MutableMapping):
+        if isinstance(msg_or_dict, collections.abc.MutableMapping):
             msg_or_dict.setdefault(basekey, {})
         set(get(msg_or_dict, basekey), subkey, value)
         return
 
-    if isinstance(msg_or_dict, collections_abc.MutableMapping):
+    if isinstance(msg_or_dict, collections.abc.MutableMapping):
         msg_or_dict[key] = value
     else:
         _set_field_on_message(msg_or_dict, key, value)