|
 |
d37ca7b |
# HG changeset patch
|
|
|
d37ca7b |
# User Jan Staněk <jstanek@redhat.com>
|
|
|
d37ca7b |
# Date 1579263565 -3600
|
|
|
d37ca7b |
# Fri Jan 17 13:19:25 2020 +0100
|
|
|
d37ca7b |
# Node ID ce83dd57a7970a020a6d727dbfd5f46723fbda44
|
|
|
d37ca7b |
# Parent 090c663dc2a1b9544a837ba34358e4fde445b182
|
|
|
d37ca7b |
python3: Import MutableMapping from collections.abc
|
|
|
d37ca7b |
|
|
|
d37ca7b |
diff -r 090c663dc2a1 -r ce83dd57a797 Lib3/bsddb/__init__.py
|
|
|
d37ca7b |
--- a/Lib3/bsddb/__init__.py Sun Jul 01 22:17:17 2018 +0200
|
|
|
d37ca7b |
+++ b/Lib3/bsddb/__init__.py Fri Jan 17 13:19:25 2020 +0100
|
|
|
d37ca7b |
@@ -66,8 +66,10 @@
|
|
|
d37ca7b |
|
|
|
d37ca7b |
from weakref import ref
|
|
|
d37ca7b |
|
|
|
d37ca7b |
-import collections
|
|
|
d37ca7b |
-MutableMapping = collections.MutableMapping
|
|
|
d37ca7b |
+try:
|
|
|
d37ca7b |
+ from collections.abc import MutableMapping
|
|
|
d37ca7b |
+except ImportError:
|
|
|
d37ca7b |
+ from collections import MutableMapping
|
|
|
d37ca7b |
|
|
|
d37ca7b |
class _iter_mixin(MutableMapping):
|
|
|
d37ca7b |
def _make_iter_cursor(self):
|
|
|
d37ca7b |
diff -r 090c663dc2a1 -r ce83dd57a797 Lib3/bsddb/dbobj.py
|
|
|
d37ca7b |
--- a/Lib3/bsddb/dbobj.py Sun Jul 01 22:17:17 2018 +0200
|
|
|
d37ca7b |
+++ b/Lib3/bsddb/dbobj.py Fri Jan 17 13:19:25 2020 +0100
|
|
|
d37ca7b |
@@ -28,8 +28,10 @@
|
|
|
d37ca7b |
else :
|
|
|
d37ca7b |
from . import db
|
|
|
d37ca7b |
|
|
|
d37ca7b |
-import collections
|
|
|
d37ca7b |
-MutableMapping = collections.MutableMapping
|
|
|
d37ca7b |
+try:
|
|
|
d37ca7b |
+ from collections.abc import MutableMapping
|
|
|
d37ca7b |
+except ImportError:
|
|
|
d37ca7b |
+ from collections import MutableMapping
|
|
|
d37ca7b |
|
|
|
d37ca7b |
class DBEnv:
|
|
|
d37ca7b |
def __init__(self, *args, **kwargs):
|
|
|
d37ca7b |
diff -r 090c663dc2a1 -r ce83dd57a797 Lib3/bsddb/dbshelve.py
|
|
|
d37ca7b |
--- a/Lib3/bsddb/dbshelve.py Sun Jul 01 22:17:17 2018 +0200
|
|
|
d37ca7b |
+++ b/Lib3/bsddb/dbshelve.py Fri Jan 17 13:19:25 2020 +0100
|
|
|
d37ca7b |
@@ -48,8 +48,10 @@
|
|
|
d37ca7b |
def _dumps(object, protocol):
|
|
|
d37ca7b |
return pickle.dumps(object, protocol=protocol)
|
|
|
d37ca7b |
|
|
|
d37ca7b |
-import collections
|
|
|
d37ca7b |
-MutableMapping = collections.MutableMapping
|
|
|
d37ca7b |
+try:
|
|
|
d37ca7b |
+ from collections.abc import MutableMapping
|
|
|
d37ca7b |
+except ImportError:
|
|
|
d37ca7b |
+ from collections import MutableMapping
|
|
|
d37ca7b |
|
|
|
d37ca7b |
#------------------------------------------------------------------------
|
|
|
d37ca7b |
|