From 13611f355c86bf2ed97b6922429102c6acc0fc6a Mon Sep 17 00:00:00 2001 From: Dan Yeaw Date: Fri, 7 Dec 2018 21:34:29 -0500 Subject: [PATCH] Fix deprecation warnings for abc module in Python 3.7 Signed-off-by: Dan Yeaw --- src/past/builtins/misc.py | 6 +++--- src/past/types/oldstr.py | 4 +--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/src/past/builtins/misc.py b/src/past/builtins/misc.py index 06fbb92d..a5393104 100644 --- a/src/past/builtins/misc.py +++ b/src/past/builtins/misc.py @@ -1,13 +1,12 @@ from __future__ import unicode_literals -import sys + import inspect -from collections import Mapping from future.utils import PY3, exec_ - if PY3: import builtins + from collections.abc import Mapping def apply(f, *args, **kw): return f(*args, **kw) @@ -44,6 +43,7 @@ def oct(number): xrange = range else: import __builtin__ + from collections import Mapping apply = __builtin__.apply chr = __builtin__.chr cmp = __builtin__.cmp diff --git a/src/past/types/oldstr.py b/src/past/types/oldstr.py index 7768d328..163276d6 100644 --- a/src/past/types/oldstr.py +++ b/src/past/types/oldstr.py @@ -2,11 +2,9 @@ Pure-Python implementation of a Python 2-like str object for Python 3. """ -from collections import Iterable from numbers import Integral -from past.utils import PY2, with_metaclass - +from past.utils import with_metaclass _builtin_bytes = bytes