Merge "Import MutableMapping from the correct Python module"
This commit is contained in:
commit
f0664995a1
@ -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
|
||||||
|
@ -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
|
||||||
|
Loading…
Reference in New Issue
Block a user