Merge pull request #418 from altendky/415-altendky-deprecation_warnings

Fix several warnings

Author: jmadler

src/future/backports/misc.py

@@ -16,7 +16,6 @@
 
 import subprocess
 from math import ceil as oldceil
-from collections import Mapping, MutableMapping
 
 from operator import itemgetter as _itemgetter, eq as _eq
 import sys
@@ -25,7 +24,12 @@
 from itertools import repeat as _repeat, chain as _chain, starmap as _starmap
 from socket import getaddrinfo, SOCK_STREAM, error, socket
 
-from future.utils import iteritems, itervalues, PY26, PY3
+from future.utils import iteritems, itervalues, PY2, PY26, PY3
+
+if PY2:
+    from collections import Mapping, MutableMapping
+else:
+    from collections.abc import Mapping, MutableMapping
 
 
 def ceil(x):

src/future/backports/urllib/request.py

@@ -109,11 +109,17 @@
 import socket
 import sys
 import time
-import collections
 import tempfile
 import contextlib
 import warnings
 
+from future.utils import PY2
+
+if PY2:
+    from collections import Iterable
+else:
+    from collections.abc import Iterable
+
 # check for SSL
 try:
     import ssl
@@ -1221,7 +1227,7 @@ def do_request_(self, request):
                         mv = memoryview(data)
                         size = len(mv) * mv.itemsize
                 except TypeError:
-                    if isinstance(data, collections.Iterable):
+                    if isinstance(data, Iterable):
                         raise ValueError("Content-Length should be specified "
                                 "for iterable data of type %r %r" % (type(data),
                                 data))

src/past/builtins/misc.py

@@ -2,7 +2,12 @@
 
 import inspect
 
-from future.utils import PY3, exec_
+from future.utils import PY2, PY3, exec_
+
+if PY2:
+    from collections import Mapping
+else:
+    from collections.abc import Mapping
 
 if PY3:
     import builtins
@@ -76,7 +81,7 @@ def execfile(filename, myglobals=None, mylocals=None):
             raise TypeError('globals must be a mapping')
         if not isinstance(mylocals, Mapping):
             raise TypeError('locals must be a mapping')
-        with open(filename, "rbU") as fin:
+        with open(filename, "rb") as fin:
              source = fin.read()
         code = compile(source, filename, "exec")
         exec_(code, myglobals, mylocals)

src/past/types/oldstr.py

@@ -4,7 +4,12 @@
 
 from numbers import Integral
 
-from past.utils import with_metaclass
+from past.utils import PY2, with_metaclass
+
+if PY2:
+    from collections import Iterable
+else:
+    from collections.abc import Iterable
 
 _builtin_bytes = bytes
 

tests/test_future/test_backports.py

@@ -10,17 +10,21 @@
 import inspect
 import pickle
 from random import randrange, shuffle
-from collections import Mapping, MutableMapping
 
 from future.backports.misc import (count,
                                    _count,
                                    OrderedDict,
                                    Counter,
                                    ChainMap,
                                    _count_elements)
-from future.utils import PY26
+from future.utils import PY2, PY26
 from future.tests.base import unittest, skip26, expectedFailurePY27
 
+if PY2:
+    from collections import Mapping, MutableMapping
+else:
+    from collections.abc import Mapping, MutableMapping
+
 
 class CountTest(unittest.TestCase):
     """Test the count function."""

tests/test_future/test_bytes.py

@@ -701,12 +701,15 @@ def test_multiple_inheritance(self):
         """
         Issue #96 (for newbytes instead of newobject)
         """
-        import collections
+        if utils.PY2:
+            from collections import Container
+        else:
+            from collections.abc import Container
 
         class Base(bytes):
             pass
 
-        class Foo(Base, collections.Container):
+        class Foo(Base, Container):
             def __contains__(self, item):
                 return False
 

tests/test_future/test_dict.py

@@ -111,12 +111,15 @@ def test_multiple_inheritance(self):
         """
         Issue #96 (for newdict instead of newobject)
         """
-        import collections
+        if utils.PY2:
+            from collections import Container
+        else:
+            from collections.abc import Container
 
         class Base(dict):
             pass
 
-        class Foo(Base, collections.Container):
+        class Foo(Base, Container):
             def __contains__(self, item):
                 return False
 

tests/test_future/test_int.py

@@ -344,7 +344,7 @@ def __int__(self):
 
         class Foo3(int):
             def __int__(self):
-                return self
+                return self.real
 
         class Foo4(int):
             def __int__(self):
@@ -1069,12 +1069,12 @@ def test_multiple_inheritance(self):
         """
         Issue #96 (for newint instead of newobject)
         """
-        import collections
+        import collections.abc
 
         class Base(int):
             pass
 
-        class Foo(Base, collections.Container):
+        class Foo(Base, collections.abc.Container):
             def __add__(self, other):
                 return 0
 

tests/test_future/test_list.py

@@ -162,12 +162,15 @@ def test_multiple_inheritance(self):
         """
         Issue #96 (for newdict instead of newobject)
         """
-        import collections
+        if utils.PY2:
+            from collections import Container
+        else:
+            from collections.abc import Container
 
         class Base(list):
             pass
 
-        class Foo(Base, collections.Container):
+        class Foo(Base, Container):
             def __contains__(self, item):
                 return False
 

tests/test_future/test_object.py

@@ -209,12 +209,15 @@ def test_multiple_inheritance(self):
         """
         Issue #96
         """
-        import collections
+        if utils.PY2:
+            from collections import Container
+        else:
+            from collections.abc import Container
 
         class Base(object):
             pass
 
-        class Foo(Base, collections.Container):
+        class Foo(Base, Container):
             def __contains__(self, item):
                 return False
 

tests/test_future/test_range.py

@@ -6,9 +6,15 @@
 from future.builtins import range
 from future.tests.base import unittest
 
-from collections import Iterator, Sequence
 from operator import attrgetter
 
+from future.utils import PY2
+
+if PY2:
+    from collections import Iterator, Sequence
+else:
+    from collections.abc import Iterator, Sequence
+
 
 class RangeTests(unittest.TestCase):
     def test_range(self):
@@ -192,7 +198,7 @@ def test_rev_stepped_slice_rev_stepped_range(self):
 
     def test_slice_zero_step(self):
         msg = '^slice step cannot be zero$'
-        with self.assertRaisesRegexp(ValueError, msg):
+        with self.assertRaisesRegex(ValueError, msg):
             range(8)[::0]
 
     def test_properties(self):

tests/test_future/test_str.py

@@ -529,12 +529,15 @@ def test_multiple_inheritance(self):
         """
         Issue #96 (for newstr instead of newobject)
         """
-        import collections
+        if utils.PY2:
+            from collections import Container
+        else:
+            from collections.abc import Container
 
         class Base(str):
             pass
 
-        class Foo(Base, collections.Container):
+        class Foo(Base, Container):
             def __contains__(self, item):
                 return False
 

tests/test_future/test_urllib_response.py

@@ -8,7 +8,7 @@
 from future.tests.base import unittest
 
 
-class TestFile(object):
+class File(object):
 
     def __init__(self):
         self.closed = False
@@ -28,7 +28,7 @@ class Testaddbase(unittest.TestCase):
     # TODO(jhylton): Write tests for other functionality of addbase()
 
     def setUp(self):
-        self.fp = TestFile()
+        self.fp = File()
         self.addbase = urllib_response.addbase(self.fp)
 
     def test_with(self):