Author: Philip Jenvey <pjen...@underboss.org>
Branch: py3k
Changeset: r69923:0c391272a085
Date: 2014-03-12 19:47 -0700
http://bitbucket.org/pypy/pypy/changeset/0c391272a085/
Log: kill int.__div__
diff --git a/pypy/objspace/std/intobject.py b/pypy/objspace/std/intobject.py
--- a/pypy/objspace/std/intobject.py
+++ b/pypy/objspace/std/intobject.py
@@ -288,7 +288,6 @@
descr_rshift, descr_rrshift = _abstract_binop('rshift')
descr_floordiv, descr_rfloordiv = _abstract_binop('floordiv')
- descr_div, descr_rdiv = _abstract_binop('div')
descr_truediv, descr_rtruediv = _abstract_binop('truediv')
descr_mod, descr_rmod = _abstract_binop('mod')
descr_divmod, descr_rdivmod = _abstract_binop('divmod')
@@ -301,7 +300,6 @@
raise oefmt(space.w_ZeroDivisionError,
"integer division or modulo by zero")
return wrapint(space, z)
-_div = func_with_new_name(_floordiv, '_div')
def _truediv(space, x, y):
@@ -760,7 +758,6 @@
descr_rshift, descr_rrshift = _make_descr_binop(_rshift, ovf=False)
descr_floordiv, descr_rfloordiv = _make_descr_binop(_floordiv)
- descr_div, descr_rdiv = _make_descr_binop(_div)
descr_truediv, descr_rtruediv = _make_descr_binop(_truediv)
descr_mod, descr_rmod = _make_descr_binop(_mod)
descr_divmod, descr_rdivmod = _make_descr_binop(
@@ -1018,8 +1015,6 @@
__floordiv__ = interpindirect2app(W_AbstractIntObject.descr_floordiv),
__rfloordiv__ = interpindirect2app(W_AbstractIntObject.descr_rfloordiv),
- __div__ = interpindirect2app(W_AbstractIntObject.descr_div),
- __rdiv__ = interpindirect2app(W_AbstractIntObject.descr_rdiv),
__truediv__ = interpindirect2app(W_AbstractIntObject.descr_truediv),
__rtruediv__ = interpindirect2app(W_AbstractIntObject.descr_rtruediv),
__mod__ = interpindirect2app(W_AbstractIntObject.descr_mod),
diff --git a/pypy/objspace/std/longobject.py b/pypy/objspace/std/longobject.py
--- a/pypy/objspace/std/longobject.py
+++ b/pypy/objspace/std/longobject.py
@@ -304,9 +304,6 @@
return newlong(space, z)
descr_floordiv, descr_rfloordiv = _make_descr_binop(_floordiv)
- _div = func_with_new_name(_floordiv, '_div')
- descr_div, descr_rdiv = _make_descr_binop(_div)
-
def _mod(self, space, w_other):
try:
z = self.num.mod(w_other.asbigint())
diff --git a/pypy/objspace/std/smalllongobject.py
b/pypy/objspace/std/smalllongobject.py
--- a/pypy/objspace/std/smalllongobject.py
+++ b/pypy/objspace/std/smalllongobject.py
@@ -266,9 +266,6 @@
return W_SmallLongObject(z)
descr_floordiv, descr_rfloordiv = _make_descr_binop(_floordiv)
- _div = func_with_new_name(_floordiv, '_div')
- descr_div, descr_rdiv = _make_descr_binop(_div)
-
def _mod(self, space, w_other):
x = self.longlong
y = w_other.longlong
diff --git a/pypy/objspace/std/test/test_intobject.py
b/pypy/objspace/std/test/test_intobject.py
--- a/pypy/objspace/std/test/test_intobject.py
+++ b/pypy/objspace/std/test/test_intobject.py
@@ -111,22 +111,6 @@
assert space.isinstance_w(v, space.w_int)
assert space.bigint_w(v).eq(rbigint.fromlong(x * y))
- def test_div(self):
- space = self.space
- for i in range(10):
- res = i//3
- f1 = iobj.W_IntObject(i)
- f2 = iobj.W_IntObject(3)
- result = f1.descr_div(space, f2)
- assert result.intval == res
- x = -sys.maxint-1
- y = -1
- f1 = iobj.W_IntObject(x)
- f2 = iobj.W_IntObject(y)
- v = f1.descr_div(space, f2)
- assert space.isinstance_w(v, space.w_int)
- assert space.bigint_w(v).eq(rbigint.fromlong(x / y))
-
def test_mod(self):
x = 1
y = 2
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
