Skip to content

Commit db114c4

Browse files
authored
Merge pull request hpcugent#335 from stdweird/mapping_py310
new Mapping import location as of py3.10
2 parents 447f8a4 + be92925 commit db114c4

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

lib/vsc/utils/py2vs3/py3.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,12 @@
3535
from tempfile import TemporaryDirectory # noqa
3636
from urllib.parse import urlencode, unquote # noqa
3737
from urllib.request import HTTPError, HTTPSHandler, Request, build_opener, urlopen # noqa
38-
from collections.abc import Mapping # noqa
38+
try:
39+
# py 3.10+
40+
from collections import Mapping # noqa
41+
except ImportError:
42+
# < py 3.10
43+
from collections.abc import Mapping # noqa
3944

4045
FileExistsErrorExc = FileExistsError # noqa
4146
FileNotFoundErrorExc = FileNotFoundError # noqa

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
]
4646

4747
PACKAGE = {
48-
'version': '3.4.9',
48+
'version': '3.4.10',
4949
'author': [sdw, jt, ag, kh],
5050
'maintainer': [sdw, jt, ag, kh],
5151
# as long as 1.0.0 is not out, vsc-base should still provide vsc.fancylogger

0 commit comments

Comments
 (0)