From 3a23ccdef80a4462f7c80f5f5ab6e4a399905c2c Mon Sep 17 00:00:00 2001 From: Shutdown <40902872+ShutdownRepo@users.noreply.github.com> Date: Thu, 21 Sep 2023 20:18:13 +0200 Subject: [PATCH 1/3] Upgrading collections import --- tools/SMBFinger/odict.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/SMBFinger/odict.py b/tools/SMBFinger/odict.py index 107cb01..ed3aa88 100644 --- a/tools/SMBFinger/odict.py +++ b/tools/SMBFinger/odict.py @@ -3,7 +3,11 @@ try: from UserDict import DictMixin except ImportError: from collections import UserDict - from collections import MutableMapping as DictMixin + # https://stackoverflow.com/questions/70870041/cannot-import-name-mutablemapping-from-collections + if sys.version_info[:2] >= (3, 8): + from collections.abc import MutableMapping + else: + from collections import MutableMapping class OrderedDict(dict, DictMixin): From 2c4cadbf7dec6e26ec2494a0cfde38655f5bebaf Mon Sep 17 00:00:00 2001 From: Shutdown <40902872+ShutdownRepo@users.noreply.github.com> Date: Fri, 22 Sep 2023 00:43:25 +0200 Subject: [PATCH 2/3] Fixing import issue like in /tools/odict.py --- tools/SMBFinger/odict.py | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/tools/SMBFinger/odict.py b/tools/SMBFinger/odict.py index ed3aa88..ca11f01 100644 --- a/tools/SMBFinger/odict.py +++ b/tools/SMBFinger/odict.py @@ -3,11 +3,10 @@ try: from UserDict import DictMixin except ImportError: from collections import UserDict - # https://stackoverflow.com/questions/70870041/cannot-import-name-mutablemapping-from-collections - if sys.version_info[:2] >= (3, 8): - from collections.abc import MutableMapping - else: - from collections import MutableMapping + try: + from collections import MutableMapping as DictMixin + except ImportError: + from collections.abc import MutableMapping as DictMixin class OrderedDict(dict, DictMixin): From aa8d81861bcdfc3dbf253b617ec044fd4807e9d4 Mon Sep 17 00:00:00 2001 From: Shutdown <40902872+ShutdownRepo@users.noreply.github.com> Date: Fri, 22 Sep 2023 00:43:58 +0200 Subject: [PATCH 3/3] Fixing collections import issue for /tools/MultiRelay/odict.py --- tools/MultiRelay/odict.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/MultiRelay/odict.py b/tools/MultiRelay/odict.py index 107cb01..ca11f01 100644 --- a/tools/MultiRelay/odict.py +++ b/tools/MultiRelay/odict.py @@ -3,7 +3,10 @@ try: from UserDict import DictMixin except ImportError: from collections import UserDict - from collections import MutableMapping as DictMixin + try: + from collections import MutableMapping as DictMixin + except ImportError: + from collections.abc import MutableMapping as DictMixin class OrderedDict(dict, DictMixin):