Merge pull request #499 from megies/py38_collections_abc

fix collections abc import for py38

Author: jmadler

src/future/backports/http/client.py

@@ -79,11 +79,15 @@
 import io
 import os
 import socket
-import collections
 from future.backports.urllib.parse import urlsplit
 import warnings
 from array import array
 
+if PY2:
+    from collections import Iterable
+else:
+    from collections.abc import Iterable
+
 __all__ = ["HTTPResponse", "HTTPConnection",
            "HTTPException", "NotConnected", "UnknownProtocol",
            "UnknownTransferEncoding", "UnimplementedFileMode",
@@ -902,7 +906,7 @@ def send(self, data):
         try:
             self.sock.sendall(data)
         except TypeError:
-            if isinstance(data, collections.Iterable):
+            if isinstance(data, Iterable):
                 for d in data:
                     self.sock.sendall(d)
             else:

src/future/types/newbytes.py

@@ -5,15 +5,19 @@
 different beast to the Python 3 bytes object.
 """
 
-from collections import Iterable
 from numbers import Integral
 import string
 import copy
 
-from future.utils import istext, isbytes, PY3, with_metaclass
+from future.utils import istext, isbytes, PY2, PY3, with_metaclass
 from future.types import no, issubset
 from future.types.newobject import newobject
 
+if PY2:
+    from collections import Iterable
+else:
+    from collections.abc import Iterable
+
 
 _builtin_bytes = bytes
 

src/future/types/newint.py

@@ -8,7 +8,6 @@
 from __future__ import division
 
 import struct
-import collections
 
 from future.types.newbytes import newbytes
 from future.types.newobject import newobject
@@ -17,6 +16,9 @@
 
 if PY3:
     long = int
+    from collections.abc import Iterable
+else:
+    from collections import Iterable
 
 
 class BaseNewInt(type):
@@ -356,7 +358,7 @@ def from_bytes(cls, mybytes, byteorder='big', signed=False):
             raise TypeError("cannot convert unicode objects to bytes")
         # mybytes can also be passed as a sequence of integers on Py3.
         # Test for this:
-        elif isinstance(mybytes, collections.Iterable):
+        elif isinstance(mybytes, Iterable):
             mybytes = newbytes(mybytes)
         b = mybytes if byteorder == 'big' else mybytes[::-1]
         if len(b) == 0:

src/future/types/newmemoryview.py

@@ -1,14 +1,16 @@
 """
 A pretty lame implementation of a memoryview object for Python 2.6.
 """
-
-from collections import Iterable
 from numbers import Integral
 import string
 
-from future.utils import istext, isbytes, PY3, with_metaclass
+from future.utils import istext, isbytes, PY2, with_metaclass
 from future.types import no, issubset
 
+if PY2:
+    from collections import Iterable
+else:
+    from collections.abc import Iterable
 
 # class BaseNewBytes(type):
 #     def __instancecheck__(cls, instance):

src/future/types/newrange.py

@@ -19,7 +19,12 @@
 """
 from __future__ import absolute_import
 
-from collections import Sequence, Iterator
+from future.utils import PY2
+
+if PY2:
+    from collections import Sequence, Iterator
+else:
+    from collections.abc import Sequence, Iterator
 from itertools import islice
 
 from future.backports.misc import count   # with step parameter on Py2.6

src/future/types/newstr.py

@@ -40,7 +40,6 @@
 
 """
 
-from collections import Iterable
 from numbers import Number
 
 from future.utils import PY3, istext, with_metaclass, isnewbytes
@@ -51,6 +50,9 @@
 if PY3:
     # We'll probably never use newstr on Py3 anyway...
     unicode = str
+    from collections.abc import Iterable
+else:
+    from collections import Iterable
 
 
 class BaseNewStr(type):