From fef336a05902f92a63484638c386b27e6a97a1ad Mon Sep 17 00:00:00 2001 From: Karthikeyan Singaravelan Date: Sat, 11 Apr 2020 13:52:57 +0000 Subject: [PATCH 1/2] Import ABC from collections.abc instead of collections for Python 3 compatibility. --- pytest-verbose-parametrize/pytest_verbose_parametrize.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pytest-verbose-parametrize/pytest_verbose_parametrize.py b/pytest-verbose-parametrize/pytest_verbose_parametrize.py index eeecb4a6..16c5cf30 100644 --- a/pytest-verbose-parametrize/pytest_verbose_parametrize.py +++ b/pytest-verbose-parametrize/pytest_verbose_parametrize.py @@ -1,4 +1,7 @@ -from collections import Iterable +try: + from collections.abc import Iterable +except ImportError: + from collections import Iterable from six import string_types, text_type From 16d70f5417b58f86e21d2c6f8bdfde07a0d5b7ad Mon Sep 17 00:00:00 2001 From: Karthikeyan Singaravelan Date: Sat, 11 Apr 2020 13:53:41 +0000 Subject: [PATCH 2/2] Fix deprecation warning regarding invalid escape sequences. --- pytest-profiling/pytest_profiling.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pytest-profiling/pytest_profiling.py b/pytest-profiling/pytest_profiling.py index 746bfc15..9917b6f5 100644 --- a/pytest-profiling/pytest_profiling.py +++ b/pytest-profiling/pytest_profiling.py @@ -17,7 +17,7 @@ def clean_filename(s): - forbidden_chars = set('/?<>\:*|"') + forbidden_chars = set(r'/?<>\:*|"') return six.text_type("".join(c if c not in forbidden_chars and ord(c) < 127 else '_' for c in s))