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

Author: edschofield

future/builtins/misc.py

@@ -59,16 +59,25 @@
     from future.builtins.newnext import newnext as next
     from future.builtins.newround import newround as round
     from future.builtins.newsuper import newsuper as super
+    from future.types.newint import newint
 
     _SENTINEL = object()
 
     def pow(x, y, z=_SENTINEL):
         """
         pow(x, y[, z]) -> number
-    
+
         With two arguments, equivalent to x**y.  With three arguments,
         equivalent to (x**y) % z, but may be more efficient (e.g. for ints).
         """
+        # Handle newints
+        if isinstance(x, newint):
+            x = long(x)
+        if isinstance(y, newint):
+            y = long(y)
+        if isinstance(z, newint):
+            z = long(z)
+
         try:
             if z == _SENTINEL:
                 return _builtin_pow(x, y)

future/tests/test_builtins.py

@@ -639,7 +639,7 @@ def __dir__(self):
         #     raise IndexError
         # except:
         #     self.assertEqual(len(dir(sys.exc_info()[2])), 4)
-        # 
+        #
         # # test that object has a __dir__()
         # self.assertEqual(sorted([].__dir__()), dir([]))
 
@@ -1271,9 +1271,9 @@ def test_pow(self):
         self.assertAlmostEqual(pow(-2.,2), 4.)
         self.assertAlmostEqual(pow(-2.,3), -8.)
 
-        for x in 2, 2.0:
-            for y in 10, 10.0:
-                for z in 1000, 1000.0:
+        for x in 2, int(2), 2.0:
+            for y in 10, int(10), 10.0:
+                for z in 1000, int(1000), 1000.0:
                     if isinstance(x, float) or \
                        isinstance(y, float) or \
                        isinstance(z, float):