From 53c8ec8144c41fcb3f57ee9316a80dcf7d952517 Mon Sep 17 00:00:00 2001 From: Huaqi Date: Mon, 11 Jul 2022 16:25:25 +0800 Subject: [PATCH] tools: fix for python3.10 https://github.com/googleapis/google-auth-library-python/pull/419 Signed-off-by: Huaqi --- tools/scripts/nsdk_cli/nsdk_utils.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/tools/scripts/nsdk_cli/nsdk_utils.py b/tools/scripts/nsdk_cli/nsdk_utils.py index 55a03bb3..ed871b86 100644 --- a/tools/scripts/nsdk_cli/nsdk_utils.py +++ b/tools/scripts/nsdk_cli/nsdk_utils.py @@ -27,6 +27,11 @@ print("Please install requried packages using: pip3 install -r %s" % (requirement_file)) sys.exit(1) +try: + from collections.abc import Mapping +except ImportError: # Python 2.7 compatibility + from collections import Mapping + SDK_GLOBAL_VARIABLES = { "sdk_checktag": "Nuclei SDK Build Time:", "sdk_check": True, @@ -166,7 +171,7 @@ def dict_merge(dct, merge_dct): """ for k, v in merge_dct.items(): if (k in dct and isinstance(dct[k], dict) - and isinstance(merge_dct[k], collections.Mapping)): + and isinstance(merge_dct[k], Mapping)): dict_merge(dct[k], merge_dct[k]) else: dct[k] = merge_dct[k]