From d51163520ada675fa49d6244c15d42d3c7e145d7 Mon Sep 17 00:00:00 2001 From: Vincent A Date: Sun, 10 Jan 2021 14:35:02 +0100 Subject: [PATCH] core: import some stuff from collections.abc (deprecation update) Since Python 3.3, some imports have moved from collections to collections.abc but were kept for compatibility, though compatibility will be dropped in Python 3.10. We will keep compatibility ourselves for some time again and thus support both imports. --- weboob/browser/filters/standard.py | 6 +++++- weboob/core/backendscfg.py | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/weboob/browser/filters/standard.py b/weboob/browser/filters/standard.py index 0d663aee93..203f371b14 100644 --- a/weboob/browser/filters/standard.py +++ b/weboob/browser/filters/standard.py @@ -23,7 +23,11 @@ import re import unicodedata import unidecode -from collections import Iterator +try: + # Python 3.3 and above + from collections.abc import Iterator +except ImportError: + from collections import Iterator from decimal import Decimal, InvalidOperation from itertools import islice from numbers import Number diff --git a/weboob/core/backendscfg.py b/weboob/core/backendscfg.py index a7508b5bd0..0743d4652a 100644 --- a/weboob/core/backendscfg.py +++ b/weboob/core/backendscfg.py @@ -25,7 +25,11 @@ from ConfigParser import RawConfigParser, DuplicateSectionError except ImportError: from configparser import RawConfigParser, DuplicateSectionError -from collections import MutableMapping +try: + # Python 3.3 and above + from collections.abc import MutableMapping +except ImportError: + from collections import MutableMapping from logging import warning from subprocess import check_output, CalledProcessError -- GitLab