Merge branch 'posita-newint-advanced-div-144' into v0.14.x

Author: edschofield

src/future/types/newint.py

@@ -201,10 +201,16 @@ def __rmod__(self, other):
 
     def __divmod__(self, other):
         value = super(newint, self).__divmod__(other)
+        if value is NotImplemented:
+            mylong = long(self)
+            return (mylong // other, mylong % other)
         return (newint(value[0]), newint(value[1]))
 
     def __rdivmod__(self, other):
         value = super(newint, self).__rdivmod__(other)
+        if value is NotImplemented:
+            mylong = long(self)
+            return (other // mylong, other % mylong)
         return (newint(value[0]), newint(value[1]))
 
     def __pow__(self, other):

tests/test_future/test_int.py

@@ -49,6 +49,9 @@ def cpython_only(f):
 
 class IntTestCases(unittest.TestCase):
 
+    def setUp(self):
+        self.longMessage = True
+
     def test_isinstance_int_subclass(self):
         """
         Issue #89
@@ -454,6 +457,24 @@ def test_divmod(self):
             assert divmod(int(x), int(-y)) == divmod(x, -y)
             assert divmod(int(-x), int(-y)) == divmod(-x, -y)
 
+            assert divmod(int(x), float(y)) == divmod(x, float(y))
+            assert divmod(int(-x), float(y)) == divmod(-x, float(y))
+            assert divmod(int(x), float(-y)) == divmod(x, float(-y))
+            assert divmod(int(-x), float(-y)) == divmod(-x, float(-y))
+
+        def _frange(x, y, step):
+            _x = x ; i = 0
+            while _x < y:
+                yield _x
+                i += 1 ; _x = x + i * step
+
+        for i in range(20):
+            for d in _frange(0.005, 5.0, 0.005):
+                self.assertEqual(divmod(int(i), d), divmod(i, d), msg='i={0}; d={1}'.format(i, d))
+                self.assertEqual(divmod(int(-i), d), divmod(-i, d), msg='i={0}; d={1}'.format(i, d))
+                self.assertEqual(divmod(int(i), -d), divmod(i, -d), msg='i={0}; d={1}'.format(i, d))
+                self.assertEqual(divmod(int(-i), -d), divmod(-i, -d), msg='i={0}; d={1}'.format(i, d))
+
     def test_div(self):
         """
         Issue #38

tests/test_future/test_int_old_division.py

@@ -6,7 +6,7 @@
 is not in effect.
 """
 
-from __future__ import (absolute_import, 
+from __future__ import (absolute_import,
                         print_function, unicode_literals)
 from future import standard_library
 from future.builtins import *
@@ -20,14 +20,18 @@
 @unittest.skipIf(not PY2, 'old division tests only for Py2')
 class IntTestCasesOldDivision(unittest.TestCase):
 
+    def setUp(self):
+        self.longMessage = True
+
+
     def test_div(self):
         """
         Issue #38
         """
         a = int(3)
         self.assertEqual(a / 5., 0.6)
         self.assertEqual(a / 5, 0)
-                                  
+
 
     def test_idiv(self):
         a = int(3)
@@ -42,7 +46,7 @@ def test_idiv(self):
         c /= 2.0
         self.assertEqual(c, -1.5)
         self.assertTrue(isinstance(c, float))
-                                  
+
 
     def test_truediv(self):
         """
@@ -74,5 +78,24 @@ def test_truediv(self):
         self.assertTrue(isinstance(e, int))
 
 
+    def test_divmod(self):
+        """
+        Test int.__divmod__
+        """
+        vals = [10**i for i in range(0, 20)]
+        for i in range(200):
+            x = random.choice(vals)
+            y = random.choice(vals)
+            self.assertEqual(int(y).__rdivmod__(int(x)), divmod(x, y), msg='x={0}; y={1}'.format(x, y))
+            self.assertEqual(int(-y).__rdivmod__(int(x)), divmod(x, -y), msg='x={0}; y={1}'.format(x, y))
+            self.assertEqual(int(y).__rdivmod__(int(-x)), divmod(-x, y), msg='x={0}; y={1}'.format(x, y))
+            self.assertEqual(int(-y).__rdivmod__(int(-x)), divmod(-x, -y), msg='x={0}; y={1}'.format(x, y))
+
+            self.assertEqual(int(x).__rdivmod__(int(y)), long(x).__rdivmod__(y), msg='x={0}; y={1}'.format(x, y))
+            self.assertEqual(int(-x).__rdivmod__(int(y)), long(-x).__rdivmod__(y), msg='x={0}; y={1}'.format(x, y))
+            self.assertEqual(int(x).__rdivmod__(int(-y)), long(x).__rdivmod__(-y), msg='x={0}; y={1}'.format(x, y))
+            self.assertEqual(int(-x).__rdivmod__(int(-y)), long(-x).__rdivmod__(-y), msg='x={0}; y={1}'.format(x, y))
+
+
 if __name__ == "__main__":
     unittest.main()