From d6ada730636198d833aafb412ec8d6f4771577c0 Mon Sep 17 00:00:00 2001 From: Hristo Stamenov Date: Mon, 25 Oct 2021 00:20:28 +0300 Subject: [PATCH] Fix import for collections Mapping Mapping and other "abstract base classes" were moved after python 3.3 from collections to collections.abc Python 3.3 is long gone and a newer version of python won't support this code. (cherry picked from commit 7ec6392d462a28ce3f9630e7299d279ccd577111) --- methods.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/methods.py b/methods.py index 08f421b6bb2..39782453cd1 100644 --- a/methods.py +++ b/methods.py @@ -1,11 +1,11 @@ -import collections import os import re import glob import subprocess from collections import OrderedDict -from compat import iteritems, isbasestring, open_utf8, decode_utf8, qualname +from collections.abc import Mapping from typing import Iterator +from compat import iteritems, isbasestring, open_utf8, decode_utf8, qualname from SCons import Node from SCons.Script import ARGUMENTS @@ -675,7 +675,7 @@ def generate_vs_project(env, num_jobs): batch_file = find_visual_c_batch_file(env) if batch_file: - class ModuleConfigs(collections.Mapping): + class ModuleConfigs(Mapping): # This version information (Win32, x64, Debug, Release, Release_Debug seems to be # required for Visual Studio to understand that it needs to generate an NMAKE # project. Do not modify without knowing what you are doing.