summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/sql
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2018-09-27 21:55:01 -0400
committerGerrit Code Review <gerrit@ci.zzzcomputing.com>2018-09-27 21:55:01 -0400
commit4085b10ec2445d24b93e9877e4a4338e7897d10f (patch)
tree3fda61f00cf470e138131745fd1f4ed3ecbb10b7 /lib/sqlalchemy/sql
parent888d122dcf5881ad1bca07df2ba444e293538d99 (diff)
parent2d2fa49130249f757f6f1100dad879e1071ad385 (diff)
downloadsqlalchemy-4085b10ec2445d24b93e9877e4a4338e7897d10f.tar.gz
Merge "Import from collections.abc"
Diffstat (limited to 'lib/sqlalchemy/sql')
-rw-r--r--lib/sqlalchemy/sql/base.py5
-rw-r--r--lib/sqlalchemy/sql/sqltypes.py2
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/sqlalchemy/sql/base.py b/lib/sqlalchemy/sql/base.py
index 9c79ccf7a..5c884e1a0 100644
--- a/lib/sqlalchemy/sql/base.py
+++ b/lib/sqlalchemy/sql/base.py
@@ -14,7 +14,6 @@ from .. import util, exc
import itertools
from .visitors import ClauseVisitor
import re
-import collections
PARSE_AUTOCOMMIT = util.symbol('PARSE_AUTOCOMMIT')
NO_ARG = util.symbol('NO_ARG')
@@ -46,7 +45,7 @@ def _generative(fn, *args, **kw):
return self
-class _DialectArgView(collections.MutableMapping):
+class _DialectArgView(util.collections_abc.MutableMapping):
"""A dictionary view of dialect-level arguments in the form
<dialectname>_<argument_name>.
@@ -99,7 +98,7 @@ class _DialectArgView(collections.MutableMapping):
)
-class _DialectArgDict(collections.MutableMapping):
+class _DialectArgDict(util.collections_abc.MutableMapping):
"""A dictionary view of dialect-level arguments for a specific
dialect.
diff --git a/lib/sqlalchemy/sql/sqltypes.py b/lib/sqlalchemy/sql/sqltypes.py
index e35ed6d1e..2b9ede43f 100644
--- a/lib/sqlalchemy/sql/sqltypes.py
+++ b/lib/sqlalchemy/sql/sqltypes.py
@@ -2098,7 +2098,7 @@ class JSON(Indexable, TypeEngine):
@util.dependencies('sqlalchemy.sql.default_comparator')
def _setup_getitem(self, default_comparator, index):
if not isinstance(index, util.string_types) and \
- isinstance(index, collections.Sequence):
+ isinstance(index, compat.collections_abc.Sequence):
index = default_comparator._check_literal(
self.expr, operators.json_path_getitem_op,
index, bindparam_type=JSON.JSONPathType