Merge pull request #421 from danyeaw/fix-deprecated-mapping

Fix deprecation warnings for abc module in Python 3.7

Author: jmadler

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

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