mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-27 05:44:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

More bug 460020. When I is a subclass of int, disable the +I(whatever),

Browse source 
I(0) << whatever, I(0) >> whatever, I(whatever) << 0 and I(whatever) >> 0
optimizations.
This commit is contained in:
Tim Peters 2001-09-11 21:44:14 +00:00
parent 95fefc7a7a
commit 73a1dfe367
2 changed files with 15 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Lib/test/test_descr.py
View file

@ -1366,6 +1366,11 @@ def inherits():
a = hexint(12345) a = hexint(12345)
verify(int(a) == 12345) verify(int(a) == 12345)
verify(int(a).__class__ is int) verify(int(a).__class__ is int)
verify((+a).__class__ is int)
verify((a >> 0).__class__ is int)
verify((a << 0).__class__ is int)
verify((hexint(0) << 12).__class__ is int)
verify((hexint(0) >> 12).__class__ is int)
class octlong(long): class octlong(long):
__slots__ = [] __slots__ = []

16
Objects/intobject.c
View file

@ -681,9 +681,13 @@ int_neg(PyIntObject *v)
static PyObject * static PyObject *
int_pos(PyIntObject *v) int_pos(PyIntObject *v)
{ {
if (PyInt_CheckExact(v)) {
Py_INCREF(v); Py_INCREF(v);
return (PyObject *)v; return (PyObject *)v;
} }
else
return PyInt_FromLong(v->ob_ival);
}
static PyObject * static PyObject *
int_abs(PyIntObject *v) int_abs(PyIntObject *v)
@ -716,10 +720,8 @@ int_lshift(PyIntObject *v, PyIntObject *w)
PyErr_SetString(PyExc_ValueError, "negative shift count"); PyErr_SetString(PyExc_ValueError, "negative shift count");
return NULL; return NULL;
} }
if (a == 0 || b == 0) { if (a == 0 || b == 0)
Py_INCREF(v); return int_pos(v);
return (PyObject *) v;
}
if (b >= LONG_BIT) { if (b >= LONG_BIT) {
return PyInt_FromLong(0L); return PyInt_FromLong(0L);
} }
@ -737,10 +739,8 @@ int_rshift(PyIntObject *v, PyIntObject *w)
PyErr_SetString(PyExc_ValueError, "negative shift count"); PyErr_SetString(PyExc_ValueError, "negative shift count");
return NULL; return NULL;
} }
if (a == 0 || b == 0) { if (a == 0 || b == 0)
Py_INCREF(v); return int_pos(v);
return (PyObject *) v;
}
if (b >= LONG_BIT) { if (b >= LONG_BIT) {
if (a < 0) if (a < 0)
a = -1; a = -1;