8000 bpo-32968: Modulo and floor division involving Fraction and float should return float by elias6 · Pull Request #5956 · python/cpython · GitHub
[go: up one dir, main page]
Skip to content

bpo-32968: Modulo and floor division involving Fraction and float should return float #5956

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Aug 27, 2018
Merged

bpo-32968: Modulo and floor division involving Fraction and float should return float #5956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
a4a004c
Fraction modulo infinity should behave consistently with other numbers
elias6 Mar 1, 2018
db3c797
Blurb for bpo-32968
elias6 Mar 1, 2018
1bd020c
Make Fraction floor division return float instead of int
elias6 Mar 1, 2018
1020bb2
Make floor division and modulo of fraction with float return a float
elias6 Mar 15, 2018
038664e
Change blurb
elias6 Mar 18, 2018
edbea71
Undo problematic change to fraction math operations
elias6 Mar 24, 2018
b3b678a
Make test less susceptible to floating-point variations, and closer t…
mdickinson Aug 25, 2018
4c087de
Add NEWS entry.
mdickinson Aug 25, 2018
7d3cce9
Update Misc/ACKS.
mdickinson Aug 25, 2018
1108ae5
Revert "Add NEWS entry."
mdickinson Aug 25, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 4 additions & 9 deletions Lib/fractions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,23 +427,18 @@ def _div(a, b):

__truediv__, __rtruediv__ = _operator_fallbacks(_div, operator.truediv)

def __floordiv__(a, b):
def _floordiv(a, b):
"""a // b"""
return math.floor(a / b)

def __rfloordiv__(b, a):
"""a // b"""
return math.floor(a / b)
__floordiv__, __rfloordiv__ = _operator_fallbacks(_floordiv, operator.floordiv)

def __mod__(a, b):
def _mod(a, b):
"""a % b"""
div = a // b
return a - b * div

def __rmod__(b, a):
"""a % b"""
div = a // b
return a - b * div
__mod__, __rmod__ = _operator_fallbacks(_mod, operator.mod)

def __pow__(a, b):
"""a ** b
Expand Down
10 changes: 7 additions & 3 deletions Lib/test/test_fractions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,15 +401,19 @@ def testMixedArithmetic(self):
self.assertTypedEquals(10.0 + 0j, (1.0 + 0j) / F(1, 10))

self.assertTypedEquals(0, F(1, 10) // 1)
self.assertTypedEquals(0, F(1, 10) // 1.0)
self.assertTypedEquals(0.0, F(1, 10) // 1.0)
self.assertTypedEquals(10, 1 // F(1, 10))
self.assertTypedEquals(10**23, 10**22 // F(1, 10))
self.assertTypedEquals(10, 1.0 // F(1, 10))
self.assertTypedEquals(1.0 // 0.1, 1.0 // F(1, 10))

self.assertTypedEquals(F(1, 10), F(1, 10) % 1)
self.assertTypedEquals(0.1, F(1, 10) % 1.0)
self.assertTypedEquals(F(0, 1), 1 % F(1, 10))
self.assertTypedEquals(0.0, 1.0 % F(1, 10))
self.assertTypedEquals(1.0 % 0.1, 1.0 % F(1, 10))
self.assertTypedEquals(0.1, F(1, 10) % float('inf'))
self.assertTypedEquals(float('-inf'), F(1, 10) % float('-inf'))
self.assertTypedEquals(float('inf'), F(-1, 10) % float('inf'))
self.assertTypedEquals(-0.1, F(-1, 10) % float('-inf'))

# No need for divmod since we don't override it.

Expand Down
1 change: 1 addition & 0 deletions Misc/ACKS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1759,6 +1759,7 @@ Masazumi Yoshikawa
Arnaud Ysmal
Bernard Yue
Moshe Zadka
Elias Zamaria
Milan Zamazal
Artur Zaprzala
Mike Zarnstorff
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Library/2018-03-18-15-57-32.bpo-32968.E4G7BO.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Modulo and floor division involving Fraction and float should return float.
0