Merge branch 'v0.13.x' of https://github.com/PythonCharmers/python-future into v0.13.x

Author: edschofield

docs/changelog.rst

@@ -1,3 +1,5 @@
+.. _whats-old:
+
 Changes in previous versions
 ****************************
 

docs/whatsnew.rst

@@ -46,4 +46,7 @@ Bug fixes
   (Thanks to @str4d).
 
 
+Previous versions
+-----------------
 
+See the :ref:`whats-old` for versions prior to v0.13.

future/tests/test_bytes.py

@@ -600,6 +600,33 @@ def test_mod(self):
         with self.assertRaises(TypeError):
             bytes(b'%r' % 'abc')
 
+    @expectedFailurePY2
+    def test_multiple_inheritance(self):
+        """
+        Issue #96 (for newbytes instead of newobject)
+        """
+        import collections
+
+        class Base(bytes):
+            pass
+
+        class Foo(Base, collections.Container):
+            def __contains__(self, item):
+                return False
+
+    @expectedFailurePY2
+    def test_with_metaclass_and_bytes(self):
+        """
+        Issue #91 (for newdict instead of newobject)
+        """
+        from future.utils import with_metaclass
+
+        class MetaClass(type):
+            pass
+
+        class TestClass(with_metaclass(MetaClass, bytes)):
+            pass
+
 
 if __name__ == '__main__':
     unittest.main()

future/tests/test_dict.py

@@ -106,6 +106,34 @@ def test_braces_create_newdict_object(self):
         d = self.d1
         self.assertTrue(type(d) == dict)
 
+    @expectedFailurePY2
+    def test_multiple_inheritance(self):
+        """
+        Issue #96 (for newdict instead of newobject)
+        """
+        import collections
+
+        class Base(dict):
+            pass
+
+        class Foo(Base, collections.Container):
+            def __contains__(self, item):
+                return False
+
+    @expectedFailurePY2
+    def test_with_metaclass_and_dict(self):
+        """
+        Issue #91 (for newdict instead of newobject)
+        """
+        from future.utils import with_metaclass
+
+        class MetaClass(type):
+            pass
+
+        class TestClass(with_metaclass(MetaClass, dict)):
+            pass
+
+
 
 if __name__ == '__main__':
     unittest.main()

future/tests/test_int.py

@@ -1038,6 +1038,33 @@ class myint(int):
             self.assertRaises(TypeError, myint.from_bytes, mytype(0), 'big')
             # self.assertRaises(TypeError, int.from_bytes, mytype(0), 'big', True)
 
+    @expectedFailurePY2
+    def test_multiple_inheritance(self):
+        """
+        Issue #96 (for newint instead of newobject)
+        """
+        import collections
+
+        class Base(int):
+            pass
+
+        class Foo(Base, collections.Container):
+            def __add__(self, other):
+                return 0
+
+    @expectedFailurePY2
+    def test_with_metaclass_and_int(self):
+        """
+        Issue #91 (for newint instead of newobject)
+        """
+        from future.utils import with_metaclass
+
+        class MetaClass(type):
+            pass
+
+        class TestClass(with_metaclass(MetaClass, int)):
+            pass
+
 
 if __name__ == "__main__":
     unittest.main()

future/tests/test_list.py

@@ -6,7 +6,7 @@
 from __future__ import absolute_import, unicode_literals, print_function
 from future.builtins import *
 from future import utils
-from future.tests.base import unittest
+from future.tests.base import unittest, expectedFailurePY2
 
 
 class TestList(unittest.TestCase):
@@ -157,6 +157,33 @@ def test_bool(self):
         l2.clear()
         self.assertFalse(bool(l2))
 
+    @expectedFailurePY2
+    def test_multiple_inheritance(self):
+        """
+        Issue #96 (for newdict instead of newobject)
+        """
+        import collections
+
+        class Base(list):
+            pass
+
+        class Foo(Base, collections.Container):
+            def __contains__(self, item):
+                return False
+
+    @expectedFailurePY2
+    def test_with_metaclass_and_list(self):
+        """
+        Issue #91 (for newdict instead of newobject)
+        """
+        from future.utils import with_metaclass
+
+        class MetaClass(type):
+            pass
+
+        class TestClass(with_metaclass(MetaClass, list)):
+            pass
+
 
 if __name__ == '__main__':
     unittest.main()

future/tests/test_object.py

@@ -7,7 +7,7 @@
 from future import utils
 from future.builtins import object, str, next, int, super
 from future.utils import implements_iterator, python_2_unicode_compatible
-from future.tests.base import unittest
+from future.tests.base import unittest, expectedFailurePY2
 
 
 class TestNewObject(unittest.TestCase):
@@ -162,6 +162,7 @@ class C(A):
         self.assertFalse(isinstance(b, C))
         self.assertTrue(isinstance(c, C))
 
+    @expectedFailurePY2
     def test_types_isinstance_newobject(self):
         a = list()
         b = dict()
@@ -204,6 +205,31 @@ def __int__(self):
         if utils.PY2:
             self.assertEqual(long(a), 0)
 
+    def test_multiple_inheritance(self):
+        """
+        Issue #96
+        """
+        import collections
+
+        class Base(object):
+            pass
+
+        class Foo(Base, collections.Container):
+            def __contains__(self, item):
+                return False
+
+    def test_with_metaclass_and_object(self):
+        """
+        Issue #91
+        """
+        from future.utils import with_metaclass
+
+        class MetaClass(type):
+            pass
+
+        class TestClass(with_metaclass(MetaClass, object)):
+            pass
+
 
 if __name__ == '__main__':
     unittest.main()

future/tests/test_str.py

@@ -6,7 +6,7 @@
 from __future__ import absolute_import, unicode_literals, print_function
 from future.builtins import *
 from future import utils
-from future.tests.base import unittest
+from future.tests.base import unittest, expectedFailurePY2
 
 import os
 
@@ -524,6 +524,33 @@ def test_maketrans_translate(self):
         self.assertRaises(TypeError, 'hello'.translate)
         self.assertRaises(TypeError, 'abababc'.translate, 'abc', 'xyz')
 
+    @expectedFailurePY2
+    def test_multiple_inheritance(self):
+        """
+        Issue #96 (for newstr instead of newobject)
+        """
+        import collections
+
+        class Base(str):
+            pass
+
+        class Foo(Base, collections.Container):
+            def __contains__(self, item):
+                return False
+
+    @expectedFailurePY2
+    def test_with_metaclass_and_str(self):
+        """
+        Issue #91 (for newstr instead of newobject)
+        """
+        from future.utils import with_metaclass
+
+        class MetaClass(type):
+            pass
+
+        class TestClass(with_metaclass(MetaClass, str)):
+            pass
+
 
 if __name__ == '__main__':
     unittest.main()

future/types/newbytes.py

@@ -11,7 +11,7 @@
 
 from future.utils import istext, isbytes, PY3, with_metaclass
 from future.types import no, issubset
-from future.types.newobject import newobject, BaseNewObject
+from future.types.newobject import newobject
 
 
 _builtin_bytes = bytes
@@ -21,7 +21,7 @@
     unicode = str
 
 
-class BaseNewBytes(BaseNewObject):
+class BaseNewBytes(type):
     def __instancecheck__(cls, instance):
         if cls == newbytes:
             return isinstance(instance, _builtin_bytes)

future/types/newdict.py

@@ -19,14 +19,14 @@
 import sys
 
 from future.utils import with_metaclass
-from future.types.newobject import newobject, BaseNewObject
+from future.types.newobject import newobject
 
 
 _builtin_dict = dict
 ver = sys.version_info[:2]
 
 
-class BaseNewDict(BaseNewObject):
+class BaseNewDict(type):
     def __instancecheck__(cls, instance):
         if cls == newdict:
             return isinstance(instance, _builtin_dict)