Merge "Import MutableMapping from the correct Python module"

This commit is contained in:
Zuul 2019-01-21 22:17:29 +00:00 committed by Gerrit Code Review
commit f0664995a1
2 changed files with 2 additions and 2 deletions

View File

@ -4,7 +4,7 @@
.. _`SQLite`: http://www.sqlite.org/ .. _`SQLite`: http://www.sqlite.org/
""" """
try: # Python 3 try: # Python 3
from collections import MutableMapping as DictMixin from collections.abc import MutableMapping as DictMixin
except ImportError: # Python 2 except ImportError: # Python 2
from UserDict import DictMixin from UserDict import DictMixin
from copy import copy from copy import copy

View File

@ -3,7 +3,7 @@
""" """
import abc import abc
try: # Python 3 try: # Python 3
from collections import MutableMapping as DictMixin from collections.abc import MutableMapping as DictMixin
except ImportError: # Python 2 except ImportError: # Python 2
from UserDict import DictMixin from UserDict import DictMixin
import warnings import warnings