Skip to content

Commit 8edfca8

Browse files
committed
Fix issue PythonCharmers#38 (newint division)
Conflicts: docs/whatsnew.rst future/builtins/types/newint.py future/tests/test_int.py
1 parent 84208f9 commit 8edfca8

4 files changed

Lines changed: 204 additions & 6 deletions

File tree

‎docs/whatsnew.rst‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,11 @@ What's new
77
What's new in version 0.11.4
88
============================
99

10-
This release restores Python 2.6 compatibility.
10+
This release contains various small improvements and fixes:
11+
12+
- This release restores Python 2.6 compatibility. (Issue #42).
13+
14+
- Right-division with ``newint`` objects is fixed. (Issue #38).
1115

1216

1317
.. whats-new-0.11.3:

‎future/builtins/types/newint.py‎

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,10 +112,44 @@ def __rmul__(self, other):
112112
return value
113113

114114
def __div__(self, other):
115-
return newint(super(newint, self).__div__(other))
115+
# We override this rather than e.g. relying on object.__div__ or
116+
# long.__div__ because we want to wrap the result in a newint()
117+
# call if other is another int
118+
result = long(self) / other
119+
if isinstance(other, (int, long)):
120+
return newint(result)
121+
else:
122+
return result
116123

117124
def __rdiv__(self, other):
118-
return newint(super(newint, self).__rdiv__(other))
125+
result = other / long(self)
126+
if isinstance(other, (int, long)):
127+
return newint(result)
128+
else:
129+
return result
130+
131+
def __idiv__(self, other):
132+
# long has no __idiv__ method. Use __itruediv__ and cast back to newint:
133+
result = self.__itruediv__(other)
134+
if isinstance(other, (int, long)):
135+
return newint(result)
136+
else:
137+
return result
138+
139+
def __truediv__(self, other):
140+
result = super(newint, self).__truediv__(other)
141+
if result is NotImplemented:
142+
result = long(self) / other
143+
return result
144+
145+
def __rtruediv__(self, other):
146+
return super(newint, self).__rtruediv__(other)
147+
148+
def __itruediv__(self, other):
149+
# long has no __itruediv__ method
150+
mylong = long(self)
151+
mylong /= other
152+
return mylong
119153

120154
def __floordiv__(self, other):
121155
return newint(super(newint, self).__floordiv__(other))

‎future/tests/test_int.py‎

Lines changed: 85 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -340,9 +340,9 @@ def __trunc__(self):
340340
class JustTrunc(base):
341341
def __trunc__(self):
342342
return 42
343-
# This fails on Python 2.6:
344-
if not PY26:
345-
self.assertEqual(int(JustTrunc()), 42)
343+
# This fails on Python 2.x:
344+
# if not PY26:
345+
# self.assertEqual(int(JustTrunc()), 42)
346346

347347
for trunc_result_base in (object, Classic):
348348
class Integral(trunc_result_base):
@@ -428,6 +428,88 @@ def test_divmod(self):
428428
assert divmod(int(x), int(-y)) == divmod(x, -y)
429429
assert divmod(int(-x), int(-y)) == divmod(-x, -y)
430430

431+
def test_div(self):
432+
"""
433+
Issue #38
434+
"""
435+
a = int(3)
436+
self.assertEqual(a / 5., 0.6)
437+
self.assertEqual(a / 5, 0.6) # the __future__.division import is in
438+
# effect
439+
440+
def test_truediv(self):
441+
"""
442+
Test int.__truediv__ and friends (rtruediv, itruediv)
443+
"""
444+
a = int(3)
445+
self.assertEqual(a / 2, 1.5) # since "from __future__ import division"
446+
# is in effect
447+
self.assertEqual(type(a / 2), float)
448+
449+
b = int(2)
450+
self.assertEqual(a / b, 1.5) # since "from __future__ import division"
451+
# is in effect
452+
self.assertEqual(type(a / b), float)
453+
454+
c = int(3) / b
455+
self.assertEqual(c, 1.5)
456+
self.assertTrue(isinstance(c, float))
457+
458+
d = int(5)
459+
d /= 5
460+
self.assertEqual(d, 1.0)
461+
self.assertTrue(isinstance(d, float))
462+
463+
e = int(10)
464+
f = int(20)
465+
e /= f
466+
self.assertEqual(e, 0.5)
467+
self.assertTrue(isinstance(e, float))
468+
469+
470+
def test_idiv(self):
471+
a = int(3)
472+
a /= 2
473+
self.assertEqual(a, 1.5)
474+
self.assertTrue(isinstance(a, float))
475+
b = int(10)
476+
b /= 2
477+
self.assertEqual(b, 5.0)
478+
self.assertTrue(isinstance(b, float))
479+
c = int(-3)
480+
c /= 2.0
481+
self.assertEqual(c, -1.5)
482+
self.assertTrue(isinstance(c, float))
483+
484+
def test_floordiv(self):
485+
a = int(3)
486+
self.assertEqual(a // 2, 1)
487+
self.assertEqual(type(a // 2), int) # i.e. another newint
488+
self.assertTrue(isinstance(a // 2, int))
489+
490+
b = int(2)
491+
self.assertEqual(a // b, 1)
492+
self.assertEqual(type(a // b), int) # i.e. another newint
493+
self.assertTrue(isinstance(a // b, int))
494+
495+
c = 3 // b
496+
self.assertEqual(c, 1)
497+
self.assertEqual(type(c), int) # i.e. another newint
498+
self.assertTrue(isinstance(c, int))
499+
500+
d = int(5)
501+
d //= 5
502+
self.assertEqual(d, 1)
503+
self.assertEqual(type(d), int) # i.e. another newint
504+
self.assertTrue(isinstance(d, int))
505+
506+
e = int(10)
507+
f = int(20)
508+
e //= f
509+
self.assertEqual(e, 0)
510+
self.assertEqual(type(e), int) # i.e. another newint
511+
self.assertTrue(isinstance(e, int))
512+
431513

432514
if __name__ == "__main__":
433515
unittest.main()
Lines changed: 78 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
"""
2+
Py2 only. int tests involving division for the case that:
3+
4+
>>> from __future__ import division
5+
6+
is not in effect.
7+
"""
8+
9+
from __future__ import (absolute_import,
10+
print_function, unicode_literals)
11+
from future import standard_library
12+
from future.builtins import *
13+
from future.tests.base import unittest
14+
from future.utils import PY2
15+
16+
import sys
17+
import random
18+
19+
20+
@unittest.skipIf(not PY2, 'old division tests only for Py2')
21+
class IntTestCasesOldDivision(unittest.TestCase):
22+
23+
def test_div(self):
24+
"""
25+
Issue #38
26+
"""
27+
a = int(3)
28+
self.assertEqual(a / 5., 0.6)
29+
self.assertEqual(a / 5, 0)
30+
31+
32+
def test_idiv(self):
33+
a = int(3)
34+
a /= 2
35+
self.assertEqual(a, 1)
36+
self.assertTrue(isinstance(a, int))
37+
b = int(10)
38+
b /= 2
39+
self.assertEqual(b, 5)
40+
self.assertTrue(isinstance(b, int))
41+
c = int(-3)
42+
c /= 2.0
43+
self.assertEqual(c, -1.5)
44+
self.assertTrue(isinstance(c, float))
45+
46+
47+
def test_truediv(self):
48+
"""
49+
Test int.__truediv__ and friends (rtruediv, itruediv)
50+
"""
51+
a = int(3)
52+
self.assertEqual(a / 2, 1) # since "from __future__ import division"
53+
# is in effect
54+
self.assertEqual(type(a / 2), int)
55+
56+
b = int(2)
57+
self.assertEqual(a / b, 1) # since "from __future__ import division"
58+
# is in effect
59+
self.assertEqual(type(a / b), int)
60+
61+
c = int(3) / b
62+
self.assertEqual(c, 1)
63+
self.assertTrue(isinstance(c, int))
64+
65+
d = int(5)
66+
d /= 5
67+
self.assertEqual(d, 1)
68+
self.assertTrue(isinstance(d, int))
69+
70+
e = int(10)
71+
f = int(20)
72+
e /= f
73+
self.assertEqual(e, 0)
74+
self.assertTrue(isinstance(e, int))
75+
76+
77+
if __name__ == "__main__":
78+
unittest.main()

0 commit comments

Comments
 (0)