From babcea76d77cf01e62c671395cd49a4dcd0e94b5 Mon Sep 17 00:00:00 2001 From: "Labossiere-Hickman, Travis James" Date: Mon, 21 Aug 2023 16:10:26 -0600 Subject: [PATCH 1/3] Since Python3.3, use collections.abc.Mapping --- logaugment/__init__.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/logaugment/__init__.py b/logaugment/__init__.py index d21e814..05d7044 100644 --- a/logaugment/__init__.py +++ b/logaugment/__init__.py @@ -1,8 +1,12 @@ -import collections import logging +import sys +if sys.version_info.major >= 3 and sys.version_info.minor >= 3: + from collections.abc import Mapping +else: + from collections import Mapping __title__ = 'logaugment' -__version__ = '0.1.3' +__version__ = '0.1.4' __author__ = 'Simeon Visser' __email__ = 'simeonvisser@gmail.com' __license__ = 'MIT' From 86e7fd39d32787389a96f2bc2effa6025a17a5bc Mon Sep 17 00:00:00 2001 From: "Labossiere-Hickman, Travis James" Date: Mon, 21 Aug 2023 16:13:56 -0600 Subject: [PATCH 2/3] Use the imported Mapping. --- logaugment/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logaugment/__init__.py b/logaugment/__init__.py index 05d7044..711ad4e 100644 --- a/logaugment/__init__.py +++ b/logaugment/__init__.py @@ -26,7 +26,7 @@ def filter(self, record): data = self._args(record) except TypeError: pass - if not data and isinstance(self._args, collections.Mapping): + if not data and isinstance(self._args, Mapping): data = self._args if data and not hasattr(record, '_logaugment'): record._logaugment = {} From 891203cd53053df0500a588071e391aaf2084f4b Mon Sep 17 00:00:00 2001 From: "Labossiere-Hickman, Travis James" Date: Mon, 21 Aug 2023 16:18:06 -0600 Subject: [PATCH 3/3] In case of Python 4 --- logaugment/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/logaugment/__init__.py b/logaugment/__init__.py index 711ad4e..cc6f834 100644 --- a/logaugment/__init__.py +++ b/logaugment/__init__.py @@ -1,6 +1,6 @@ import logging import sys -if sys.version_info.major >= 3 and sys.version_info.minor >= 3: +if (sys.version_info.major, sys.version_info.minor) >= (3, 3): from collections.abc import Mapping else: from collections import Mapping