python 3.10: fix Mapping imports

python/nistoar/doi/datacite.py

@@ -7,7 +7,8 @@
 DataCite services.  
 """
 import re
-from collections import OrderedDict, Mapping
+from collections import OrderedDict
+from collections.abc import Mapping
 from copy import deepcopy
 from io import StringIO
 import requests

python/nistoar/id/persist.py

@@ -4,7 +4,8 @@
 locking to prevent two processes from acquiring the same ID.
 """
 import os, logging, json
-from collections import Mapping
+from collections import OrderedDict
+from collections.abc import Mapping
 from copy import deepcopy
 from .minter import IDRegistry, IDMinter, NoidMinter, NIST_ARK_NAAN
 import pynoid as noid, filelock

python/nistoar/nerdm/convert/latest.py

@@ -2,7 +2,8 @@
 Module for converting a NERDm record to the latest schema versions.  
 """
 import re
-from collections import OrderedDict, Mapping
+from collections import OrderedDict
+from collections.abc import Mapping
 from copy import deepcopy
 from urllib.parse import urlparse
 

python/nistoar/nerdm/convert/pod.py

@@ -2,7 +2,8 @@
 Classes and functions for converting from and to the NERDm schema
 """
 import os, json, re
-from collections import OrderedDict, Mapping
+from collections import OrderedDict
+from collections.abc import Mapping
 
 from ... import jq
 from ...doi import resolve, is_DOI

python/nistoar/nerdm/convert/rmm.py

@@ -17,7 +17,8 @@
                        as a version-specific ID.
 """
 import re
-from collections import OrderedDict, Mapping
+from collections import OrderedDict
+from collections.abc import Mapping
 from urllib.parse import urljoin
 from copy import deepcopy
 

python/nistoar/nerdm/validate.py

@@ -1,7 +1,8 @@
 """
 tools for validating NERDm metadata
 """
-from collections import Mapping
+from collections import OrderedDict
+from collections.abc import Mapping
 
 import ejsonschema as ejs
 from ejsonschema import ValidationError, RefResolutionError

python/nistoar/rmm/mongo/nerdm.py

@@ -3,7 +3,8 @@
 """
 # import pandas as pd
 import json, os, sys, warnings
-from collections import Mapping
+from collections import OrderedDict
+from collections.abc import Mapping
 
 from .loader import (Loader, RecordIngestError, JSONEncodingError,
                      UpdateWarning, LoadLog)

python/tests/nistoar/doi/resolving/test_crossref.py

@@ -1,6 +1,6 @@
 import os, sys, pdb, shutil, logging, json
 import unittest as test
-from collections import Mapping
+from collections.abc import Mapping
 # from nistoar.tests import *
 
 import nistoar.doi.resolving.crossref as res

python/tests/nistoar/doi/resolving/test_datacite.py

@@ -1,6 +1,6 @@
 import os, sys, pdb, shutil, logging, json
 import unittest as test
-from collections import Mapping
+from collections.abc import Mapping
 # from nistoar.tests import *
 
 import nistoar.doi.resolving.datacite as res

python/tests/nistoar/doi/sim_datacite_srv.py

@@ -1,7 +1,8 @@
 import json, os, sys, re, hashlib, json, logging, random
 from datetime import datetime
 from wsgiref.headers import Headers
-from collections import OrderedDict, Mapping
+from collections import OrderedDict
+from collections.abc import Mapping
 from copy import deepcopy
 from urllib.parse import parse_qs
 

python/tests/nistoar/nerdm/test_validate.py

@@ -1,5 +1,5 @@
 import unittest, pdb, os, json
-from collections import Mapping
+from collections.abc import Mapping
 
 import ejsonschema as ejs