More code cleanup. Remove unnecessary indirection to useless class methods.

This commit is contained in:
Raymond Hettinger 2008-01-24 23:50:26 +00:00
parent 31eaafef4a
commit 909e334e8a
1 changed files with 15 additions and 15 deletions

View File

@ -285,8 +285,9 @@ class Rational(RationalAbc):
__truediv__, __rtruediv__ = _operator_fallbacks(_div, operator.truediv)
__div__, __rdiv__ = _operator_fallbacks(_div, operator.div)
@classmethod
def _floordiv(cls, a, b):
def __floordiv__(a, b):
"""a // b"""
# Will be math.floor(a / b) in 3.0.
div = a / b
if isinstance(div, RationalAbc):
# trunc(math.floor(div)) doesn't work if the rational is
@ -296,28 +297,27 @@ class Rational(RationalAbc):
else:
return math.floor(div)
def __floordiv__(a, b):
"""a // b"""
# Will be math.floor(a / b) in 3.0.
return a._floordiv(a, b)
def __rfloordiv__(b, a):
"""a // b"""
# Will be math.floor(a / b) in 3.0.
return b._floordiv(a, b)
@classmethod
def _mod(cls, a, b):
div = a // b
return a - b * div
div = a / b
if isinstance(div, RationalAbc):
# trunc(math.floor(div)) doesn't work if the rational is
# more precise than a float because the intermediate
# rounding may cross an integer boundary.
return div.numerator // div.denominator
else:
return math.floor(div)
def __mod__(a, b):
"""a % b"""
return a._mod(a, b)
div = a // b
return a - b * div
def __rmod__(b, a):
"""a % b"""
return b._mod(a, b)
div = a // b
return a - b * div
def __pow__(a, b):
"""a ** b