Author: Philip Jenvey <pjen...@underboss.org> Branch: py3k Changeset: r74150:ffeda9a7688e Date: 2014-10-24 00:28 -0700 http://bitbucket.org/pypy/pypy/changeset/ffeda9a7688e/
Log: kill __div__ diff --git a/pypy/objspace/std/complexobject.py b/pypy/objspace/std/complexobject.py --- a/pypy/objspace/std/complexobject.py +++ b/pypy/objspace/std/complexobject.py @@ -532,8 +532,6 @@ __rsub__ = interp2app(W_ComplexObject.descr_rsub), __mul__ = interp2app(W_ComplexObject.descr_mul), __rmul__ = interp2app(W_ComplexObject.descr_rmul), - __div__ = interp2app(W_ComplexObject.descr_truediv), - __rdiv__ = interp2app(W_ComplexObject.descr_rtruediv), __truediv__ = interp2app(W_ComplexObject.descr_truediv), __rtruediv__ = interp2app(W_ComplexObject.descr_rtruediv), __pow__ = interp2app(W_ComplexObject.descr_pow), diff --git a/pypy/objspace/std/floatobject.py b/pypy/objspace/std/floatobject.py --- a/pypy/objspace/std/floatobject.py +++ b/pypy/objspace/std/floatobject.py @@ -676,8 +676,6 @@ __rsub__ = interp2app(W_FloatObject.descr_rsub), __mul__ = interp2app(W_FloatObject.descr_mul), __rmul__ = interp2app(W_FloatObject.descr_rmul), - __div__ = interp2app(W_FloatObject.descr_div), - __rdiv__ = interp2app(W_FloatObject.descr_rdiv), __truediv__ = interp2app(W_FloatObject.descr_div), __rtruediv__ = interp2app(W_FloatObject.descr_rdiv), __floordiv__ = interp2app(W_FloatObject.descr_floordiv), diff --git a/pypy/objspace/std/test/test_complexobject.py b/pypy/objspace/std/test/test_complexobject.py --- a/pypy/objspace/std/test/test_complexobject.py +++ b/pypy/objspace/std/test/test_complexobject.py @@ -92,15 +92,11 @@ if x != 0: q = z / x assert self.close(q, y) - q = z.__div__(x) - assert self.close(q, y) q = z.__truediv__(x) assert self.close(q, y) if y != 0: q = z / y assert self.close(q, x) - q = z.__div__(y) - assert self.close(q, x) q = z.__truediv__(y) assert self.close(q, x) @@ -170,7 +166,7 @@ self.check_div(complex(random(), random()), complex(random(), random())) - raises(ZeroDivisionError, complex.__div__, 1+1j, 0+0j) + raises(ZeroDivisionError, complex.__truediv__, 1+1j, 0+0j) # FIXME: The following currently crashes on Alpha raises(OverflowError, pow, 1e200+1j, 1e200+1j) _______________________________________________ pypy-commit mailing list pypy-commit@python.org https://mail.python.org/mailman/listinfo/pypy-commit