Skip to content

Commit

Permalink
Import ABC from collections.abc instead of collections for Python 3.9…
Browse files Browse the repository at this point in the history
… compatibility. (#286)
  • Loading branch information
tirkarthi authored and jameslynnwu committed Jan 27, 2020
1 parent 88a05fb commit cfefe5a
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 5 deletions.
10 changes: 7 additions & 3 deletions apitools/base/py/extra_types.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

"""Extra types understood by apitools."""

import collections
import datetime
import json
import numbers
Expand All @@ -30,6 +29,11 @@
from apitools.base.py import exceptions
from apitools.base.py import util

if six.PY3:
from collections.abc import Iterable
else:
from collections import Iterable

__all__ = [
'DateField',
'DateTimeMessage',
Expand Down Expand Up @@ -129,7 +133,7 @@ def _PythonValueToJsonValue(py_value):
return JsonValue(double_value=float(py_value))
if isinstance(py_value, dict):
return JsonValue(object_value=_PythonValueToJsonObject(py_value))
if isinstance(py_value, collections.Iterable):
if isinstance(py_value, Iterable):
return JsonValue(array_value=_PythonValueToJsonArray(py_value))
raise exceptions.InvalidDataError(
'Cannot convert "%s" to JsonValue' % py_value)
Expand Down Expand Up @@ -212,7 +216,7 @@ def _JsonProtoToPythonValue(json_proto):
def _PythonValueToJsonProto(py_value):
if isinstance(py_value, dict):
return _PythonValueToJsonObject(py_value)
if (isinstance(py_value, collections.Iterable) and
if (isinstance(py_value, Iterable) and
not isinstance(py_value, six.string_types)):
return _PythonValueToJsonArray(py_value)
return _PythonValueToJsonValue(py_value)
Expand Down
8 changes: 6 additions & 2 deletions apitools/base/py/util.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

"""Assorted utilities shared between parts of apitools."""

import collections
import os
import random

Expand All @@ -30,6 +29,11 @@
from apitools.base.py import encoding_helper as encoding
from apitools.base.py import exceptions

if six.PY3:
from collections.abc import Iterable
else:
from collections import Iterable

__all__ = [
'DetectGae',
'DetectGce',
Expand Down Expand Up @@ -78,7 +82,7 @@ def NormalizeScopes(scope_spec):
if isinstance(scope_spec, six.string_types):
scope_spec = six.ensure_str(scope_spec)
return set(scope_spec.split(' '))
elif isinstance(scope_spec, collections.Iterable):
elif isinstance(scope_spec, Iterable):
scope_spec = [six.ensure_str(x) for x in scope_spec]
return set(scope_spec)
raise exceptions.TypecheckError(
Expand Down

0 comments on commit cfefe5a

Please sign in to comment.