diff options
Diffstat (limited to 'Objects/abstract.c')
| -rw-r--r-- | Objects/abstract.c | 1987 |
1 files changed, 1179 insertions, 808 deletions
diff --git a/Objects/abstract.c b/Objects/abstract.c index dc8ba10..75c1a10 100644 --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -1,12 +1,12 @@ /* Abstract Object Interface (many thanks to Jim Fulton) */ #include "Python.h" -#include "pycore_pyerrors.h" -#include "pycore_pystate.h" #include <ctype.h> #include "structmember.h" /* we need the offsetof() macro from there */ #include "longintrepr.h" +#define NEW_STYLE_NUMBER(o) PyType_HasFeature((o)->ob_type, \ + Py_TPFLAGS_CHECKTYPES) /* Shorthands to return certain errors */ @@ -29,15 +29,29 @@ null_error(void) /* Operations on any object */ +int +PyObject_Cmp(PyObject *o1, PyObject *o2, int *result) +{ + int r; + + if (o1 == NULL || o2 == NULL) { + null_error(); + return -1; + } + r = PyObject_Compare(o1, o2); + if (PyErr_Occurred()) + return -1; + *result = r; + return 0; +} + PyObject * PyObject_Type(PyObject *o) { PyObject *v; - if (o == NULL) { + if (o == NULL) return null_error(); - } - v = (PyObject *)o->ob_type; Py_INCREF(v); return v; @@ -54,11 +68,8 @@ PyObject_Size(PyObject *o) } m = o->ob_type->tp_as_sequence; - if (m && m->sq_length) { - Py_ssize_t len = m->sq_length(o); - assert(len >= 0 || PyErr_Occurred()); - return len; - } + if (m && m->sq_length) + return m->sq_length(o); return PyMapping_Size(o); } @@ -71,94 +82,68 @@ PyObject_Length(PyObject *o) } #define PyObject_Length PyObject_Size -int -_PyObject_HasLen(PyObject *o) { - return (Py_TYPE(o)->tp_as_sequence && Py_TYPE(o)->tp_as_sequence->sq_length) || - (Py_TYPE(o)->tp_as_mapping && Py_TYPE(o)->tp_as_mapping->mp_length); -} /* The length hint function returns a non-negative value from o.__len__() - or o.__length_hint__(). If those methods aren't found the defaultvalue is - returned. If one of the calls fails with an exception other than TypeError + or o.__length_hint__(). If those methods aren't found or return a negative + value, then the defaultvalue is returned. If one of the calls fails, this function returns -1. */ Py_ssize_t -PyObject_LengthHint(PyObject *o, Py_ssize_t defaultvalue) -{ - PyObject *hint, *result; - Py_ssize_t res; - _Py_IDENTIFIER(__length_hint__); - if (_PyObject_HasLen(o)) { - res = PyObject_Length(o); - if (res < 0) { - assert(PyErr_Occurred()); - if (!PyErr_ExceptionMatches(PyExc_TypeError)) { +_PyObject_LengthHint(PyObject *o, Py_ssize_t defaultvalue) +{ + static PyObject *hintstrobj = NULL; + PyObject *ro, *hintmeth; + Py_ssize_t rv; + + /* try o.__len__() */ + rv = PyObject_Size(o); + if (rv >= 0) + return rv; + if (PyErr_Occurred()) { + if (!PyErr_ExceptionMatches(PyExc_TypeError) && + !PyErr_ExceptionMatches(PyExc_AttributeError)) return -1; - } - PyErr_Clear(); - } - else { - return res; - } + PyErr_Clear(); } - hint = _PyObject_LookupSpecial(o, &PyId___length_hint__); - if (hint == NULL) { - if (PyErr_Occurred()) { - return -1; - } + + if (PyInstance_Check(o)) return defaultvalue; - } - result = _PyObject_CallNoArg(hint); - Py_DECREF(hint); - if (result == NULL) { - if (PyErr_ExceptionMatches(PyExc_TypeError)) { - PyErr_Clear(); + /* try o.__length_hint__() */ + hintmeth = _PyObject_LookupSpecial(o, "__length_hint__", &hintstrobj); + if (hintmeth == NULL) { + if (PyErr_Occurred()) + return -1; + else return defaultvalue; - } - return -1; } - else if (result == Py_NotImplemented) { - Py_DECREF(result); + ro = PyObject_CallFunctionObjArgs(hintmeth, NULL); + Py_DECREF(hintmeth); + if (ro == NULL) { + if (!PyErr_ExceptionMatches(PyExc_TypeError) && + !PyErr_ExceptionMatches(PyExc_AttributeError)) + return -1; + PyErr_Clear(); return defaultvalue; } - if (!PyLong_Check(result)) { - PyErr_Format(PyExc_TypeError, "__length_hint__ must be an integer, not %.100s", - Py_TYPE(result)->tp_name); - Py_DECREF(result); - return -1; - } - res = PyLong_AsSsize_t(result); - Py_DECREF(result); - if (res < 0 && PyErr_Occurred()) { - return -1; - } - if (res < 0) { - PyErr_Format(PyExc_ValueError, "__length_hint__() should return >= 0"); - return -1; - } - return res; + rv = PyNumber_Check(ro) ? PyInt_AsSsize_t(ro) : defaultvalue; + Py_DECREF(ro); + return rv; } PyObject * PyObject_GetItem(PyObject *o, PyObject *key) { PyMappingMethods *m; - PySequenceMethods *ms; - if (o == NULL || key == NULL) { + if (o == NULL || key == NULL) return null_error(); - } m = o->ob_type->tp_as_mapping; - if (m && m->mp_subscript) { - PyObject *item = m->mp_subscript(o, key); - assert((item != NULL) ^ (PyErr_Occurred() != NULL)); - return item; - } + if (m && m->mp_subscript) + return m->mp_subscript(o, key); - ms = o->ob_type->tp_as_sequence; - if (ms && ms->sq_item) { + if (o->ob_type->tp_as_sequence) { if (PyIndex_Check(key)) { Py_ssize_t key_value; key_value = PyNumber_AsSsize_t(key, PyExc_IndexError); @@ -166,26 +151,12 @@ PyObject_GetItem(PyObject *o, PyObject *key) return NULL; return PySequence_GetItem(o, key_value); } - else { + else if (o->ob_type->tp_as_sequence->sq_item) return type_error("sequence index must " "be integer, not '%.200s'", key); - } - } - - if (PyType_Check(o)) { - PyObject *meth, *result; - _Py_IDENTIFIER(__class_getitem__); - if (_PyObject_LookupAttrId(o, &PyId___class_getitem__, &meth) < 0) { - return NULL; - } - if (meth) { - result = _PyObject_CallOneArg(meth, key); - Py_DECREF(meth); - return result; - } } - return type_error("'%.200s' object is not subscriptable", o); + return type_error("'%.200s' object has no attribute '__getitem__'", o); } int @@ -253,7 +224,7 @@ PyObject_DelItem(PyObject *o, PyObject *key) } int -PyObject_DelItemString(PyObject *o, const char *key) +PyObject_DelItemString(PyObject *o, char *key) { PyObject *okey; int ret; @@ -262,7 +233,7 @@ PyObject_DelItemString(PyObject *o, const char *key) null_error(); return -1; } - okey = PyUnicode_FromString(key); + okey = PyString_FromString(key); if (okey == NULL) return -1; ret = PyObject_DelItem(o, okey); @@ -270,57 +241,84 @@ PyObject_DelItemString(PyObject *o, const char *key) return ret; } -/* We release the buffer right after use of this function which could - cause issues later on. Don't use these functions in new code. - */ int -PyObject_CheckReadBuffer(PyObject *obj) -{ - PyBufferProcs *pb = obj->ob_type->tp_as_buffer; - Py_buffer view; - - if (pb == NULL || - pb->bf_getbuffer == NULL) - return 0; - if ((*pb->bf_getbuffer)(obj, &view, PyBUF_SIMPLE) == -1) { - PyErr_Clear(); - return 0; - } - PyBuffer_Release(&view); - return 1; -} - -static int -as_read_buffer(PyObject *obj, const void **buffer, Py_ssize_t *buffer_len) +PyObject_AsCharBuffer(PyObject *obj, + const char **buffer, + Py_ssize_t *buffer_len) { - Py_buffer view; + PyBufferProcs *pb; + char *pp; + Py_ssize_t len; if (obj == NULL || buffer == NULL || buffer_len == NULL) { null_error(); return -1; } - if (PyObject_GetBuffer(obj, &view, PyBUF_SIMPLE) != 0) + pb = obj->ob_type->tp_as_buffer; + if (pb == NULL || + pb->bf_getcharbuffer == NULL || + pb->bf_getsegcount == NULL) { + PyErr_SetString(PyExc_TypeError, + "expected a string or other character buffer object"); return -1; - - *buffer = view.buf; - *buffer_len = view.len; - PyBuffer_Release(&view); + } + if ((*pb->bf_getsegcount)(obj,NULL) != 1) { + PyErr_SetString(PyExc_TypeError, + "expected a single-segment buffer object"); + return -1; + } + len = (*pb->bf_getcharbuffer)(obj, 0, &pp); + if (len < 0) + return -1; + *buffer = pp; + *buffer_len = len; return 0; } int -PyObject_AsCharBuffer(PyObject *obj, - const char **buffer, - Py_ssize_t *buffer_len) +PyObject_CheckReadBuffer(PyObject *obj) { - return as_read_buffer(obj, (const void **)buffer, buffer_len); + PyBufferProcs *pb = obj->ob_type->tp_as_buffer; + + if (pb == NULL || + pb->bf_getreadbuffer == NULL || + pb->bf_getsegcount == NULL || + (*pb->bf_getsegcount)(obj, NULL) != 1) + return 0; + return 1; } int PyObject_AsReadBuffer(PyObject *obj, const void **buffer, Py_ssize_t *buffer_len) { - return as_read_buffer(obj, buffer, buffer_len); + PyBufferProcs *pb; + void *pp; + Py_ssize_t len; + + if (obj == NULL || buffer == NULL || buffer_len == NULL) { + null_error(); + return -1; + } + pb = obj->ob_type->tp_as_buffer; + if (pb == NULL || + pb->bf_getreadbuffer == NULL || + pb->bf_getsegcount == NULL) { + PyErr_SetString(PyExc_TypeError, + "expected a readable buffer object"); + return -1; + } + if ((*pb->bf_getsegcount)(obj, NULL) != 1) { + PyErr_SetString(PyExc_TypeError, + "expected a single-segment buffer object"); + return -1; + } + len = (*pb->bf_getreadbuffer)(obj, 0, &pp); + if (len < 0) + return -1; + *buffer = pp; + *buffer_len = len; + return 0; } int PyObject_AsWriteBuffer(PyObject *obj, @@ -328,7 +326,8 @@ int PyObject_AsWriteBuffer(PyObject *obj, Py_ssize_t *buffer_len) { PyBufferProcs *pb; - Py_buffer view; + void*pp; + Py_ssize_t len; if (obj == NULL || buffer == NULL || buffer_len == NULL) { null_error(); @@ -336,16 +335,22 @@ int PyObject_AsWriteBuffer(PyObject *obj, } pb = obj->ob_type->tp_as_buffer; if (pb == NULL || - pb->bf_getbuffer == NULL || - ((*pb->bf_getbuffer)(obj, &view, PyBUF_WRITABLE) != 0)) { + pb->bf_getwritebuffer == NULL || + pb->bf_getsegcount == NULL) { PyErr_SetString(PyExc_TypeError, - "expected a writable bytes-like object"); + "expected a writeable buffer object"); return -1; } - - *buffer = view.buf; - *buffer_len = view.len; - PyBuffer_Release(&view); + if ((*pb->bf_getsegcount)(obj, NULL) != 1) { + PyErr_SetString(PyExc_TypeError, + "expected a single-segment buffer object"); + return -1; + } + len = (*pb->bf_getwritebuffer)(obj,0,&pp); + if (len < 0) + return -1; + *buffer = pp; + *buffer_len = len; return 0; } @@ -354,95 +359,68 @@ int PyObject_AsWriteBuffer(PyObject *obj, int PyObject_GetBuffer(PyObject *obj, Py_buffer *view, int flags) { - PyBufferProcs *pb = obj->ob_type->tp_as_buffer; - - if (pb == NULL || pb->bf_getbuffer == NULL) { + if (!PyObject_CheckBuffer(obj)) { PyErr_Format(PyExc_TypeError, - "a bytes-like object is required, not '%.100s'", + "'%100s' does not have the buffer interface", Py_TYPE(obj)->tp_name); return -1; } - return (*pb->bf_getbuffer)(obj, view, flags); + return (*(obj->ob_type->tp_as_buffer->bf_getbuffer))(obj, view, flags); } static int -_IsFortranContiguous(const Py_buffer *view) +_IsFortranContiguous(Py_buffer *view) { Py_ssize_t sd, dim; int i; - /* 1) len = product(shape) * itemsize - 2) itemsize > 0 - 3) len = 0 <==> exists i: shape[i] = 0 */ - if (view->len == 0) return 1; - if (view->strides == NULL) { /* C-contiguous by definition */ - /* Trivially F-contiguous */ - if (view->ndim <= 1) return 1; - - /* ndim > 1 implies shape != NULL */ - assert(view->shape != NULL); - - /* Effectively 1-d */ - sd = 0; - for (i=0; i<view->ndim; i++) { - if (view->shape[i] > 1) sd += 1; - } - return sd <= 1; - } - - /* strides != NULL implies both of these */ - assert(view->ndim > 0); - assert(view->shape != NULL); + if (view->ndim == 0) return 1; + if (view->strides == NULL) return (view->ndim == 1); sd = view->itemsize; + if (view->ndim == 1) return (view->shape[0] == 1 || + sd == view->strides[0]); for (i=0; i<view->ndim; i++) { dim = view->shape[i]; - if (dim > 1 && view->strides[i] != sd) { - return 0; - } + if (dim == 0) return 1; + if (view->strides[i] != sd) return 0; sd *= dim; } return 1; } static int -_IsCContiguous(const Py_buffer *view) +_IsCContiguous(Py_buffer *view) { Py_ssize_t sd, dim; int i; - /* 1) len = product(shape) * itemsize - 2) itemsize > 0 - 3) len = 0 <==> exists i: shape[i] = 0 */ - if (view->len == 0) return 1; - if (view->strides == NULL) return 1; /* C-contiguous by definition */ - - /* strides != NULL implies both of these */ - assert(view->ndim > 0); - assert(view->shape != NULL); + if (view->ndim == 0) return 1; + if (view->strides == NULL) return 1; sd = view->itemsize; + if (view->ndim == 1) return (view->shape[0] == 1 || + sd == view->strides[0]); for (i=view->ndim-1; i>=0; i--) { dim = view->shape[i]; - if (dim > 1 && view->strides[i] != sd) { - return 0; - } + if (dim == 0) return 1; + if (view->strides[i] != sd) return 0; sd *= dim; } return 1; } int -PyBuffer_IsContiguous(const Py_buffer *view, char order) +PyBuffer_IsContiguous(Py_buffer *view, char fort) { if (view->suboffsets != NULL) return 0; - if (order == 'C') + if (fort == 'C') return _IsCContiguous(view); - else if (order == 'F') + else if (fort == 'F') return _IsFortranContiguous(view); - else if (order == 'A') + else if (fort == 'A') return (_IsCContiguous(view) || _IsFortranContiguous(view)); return 0; } @@ -496,46 +474,60 @@ _Py_add_one_to_index_C(int nd, Py_ssize_t *index, const Py_ssize_t *shape) } } -Py_ssize_t -PyBuffer_SizeFromFormat(const char *format) + /* view is not checked for consistency in either of these. It is + assumed that the size of the buffer is view->len in + view->len / view->itemsize elements. + */ + +int +PyBuffer_ToContiguous(void *buf, Py_buffer *view, Py_ssize_t len, char fort) { - PyObject *structmodule = NULL; - PyObject *calcsize = NULL; - PyObject *res = NULL; - PyObject *fmt = NULL; - Py_ssize_t itemsize = -1; + int k; + void (*addone)(int, Py_ssize_t *, const Py_ssize_t *); + Py_ssize_t *indices, elements; + char *dest, *ptr; - structmodule = PyImport_ImportModule("struct"); - if (structmodule == NULL) { - return itemsize; + if (len > view->len) { + len = view->len; } - calcsize = PyObject_GetAttrString(structmodule, "calcsize"); - if (calcsize == NULL) { - goto done; + if (PyBuffer_IsContiguous(view, fort)) { + /* simplest copy is all that is needed */ + memcpy(buf, view->buf, len); + return 0; } - fmt = PyUnicode_FromString(format); - if (fmt == NULL) { - goto done; - } + /* Otherwise a more elaborate scheme is needed */ - res = PyObject_CallFunctionObjArgs(calcsize, fmt, NULL); - if (res == NULL) { - goto done; + /* view->ndim <= 64 */ + indices = (Py_ssize_t *)PyMem_Malloc(sizeof(Py_ssize_t)*(view->ndim)); + if (indices == NULL) { + PyErr_NoMemory(); + return -1; } - - itemsize = PyLong_AsSsize_t(res); - if (itemsize < 0) { - goto done; + for (k=0; k<view->ndim;k++) { + indices[k] = 0; } -done: - Py_DECREF(structmodule); - Py_XDECREF(calcsize); - Py_XDECREF(fmt); - Py_XDECREF(res); - return itemsize; + if (fort == 'F') { + addone = _Py_add_one_to_index_F; + } + else { + addone = _Py_add_one_to_index_C; + } + dest = buf; + /* XXX : This is not going to be the fastest code in the world + several optimizations are possible. + */ + elements = len / view->itemsize; + while (elements--) { + ptr = PyBuffer_GetPointer(view, indices); + memcpy(dest, ptr, view->itemsize); + dest += view->itemsize; + addone(view->ndim, indices, view->shape); + } + PyMem_Free(indices); + return 0; } int @@ -600,8 +592,8 @@ int PyObject_CopyData(PyObject *dest, PyObject *src) if (!PyObject_CheckBuffer(dest) || !PyObject_CheckBuffer(src)) { PyErr_SetString(PyExc_TypeError, - "both destination and source must be "\ - "bytes-like objects"); + "both destination and source must have the "\ + "buffer interface"); return -1; } @@ -686,14 +678,9 @@ PyBuffer_FillContiguousStrides(int nd, Py_ssize_t *shape, int PyBuffer_FillInfo(Py_buffer *view, PyObject *obj, void *buf, Py_ssize_t len, - int readonly, int flags) + int readonly, int flags) { - if (view == NULL) { - PyErr_SetString(PyExc_BufferError, - "PyBuffer_FillInfo: view==NULL argument is obsolete"); - return -1; - } - + if (view == NULL) return 0; if (((flags & PyBUF_WRITABLE) == PyBUF_WRITABLE) && (readonly == 1)) { PyErr_SetString(PyExc_BufferError, @@ -727,88 +714,183 @@ void PyBuffer_Release(Py_buffer *view) { PyObject *obj = view->obj; - PyBufferProcs *pb; - if (obj == NULL) - return; - pb = Py_TYPE(obj)->tp_as_buffer; - if (pb && pb->bf_releasebuffer) - pb->bf_releasebuffer(obj, view); + if (obj && Py_TYPE(obj)->tp_as_buffer && Py_TYPE(obj)->tp_as_buffer->bf_releasebuffer) + Py_TYPE(obj)->tp_as_buffer->bf_releasebuffer(obj, view); + Py_XDECREF(obj); view->obj = NULL; - Py_DECREF(obj); } PyObject * -PyObject_Format(PyObject *obj, PyObject *format_spec) +PyObject_Format(PyObject* obj, PyObject *format_spec) { - PyObject *meth; PyObject *empty = NULL; PyObject *result = NULL; - _Py_IDENTIFIER(__format__); - - if (format_spec != NULL && !PyUnicode_Check(format_spec)) { - PyErr_Format(PyExc_SystemError, - "Format specifier must be a string, not %.200s", - Py_TYPE(format_spec)->tp_name); - return NULL; - } - - /* Fast path for common types. */ - if (format_spec == NULL || PyUnicode_GET_LENGTH(format_spec) == 0) { - if (PyUnicode_CheckExact(obj)) { - Py_INCREF(obj); - return obj; - } - if (PyLong_CheckExact(obj)) { - return PyObject_Str(obj); - } - } +#ifdef Py_USING_UNICODE + int spec_is_unicode; + int result_is_unicode; +#endif /* If no format_spec is provided, use an empty string */ if (format_spec == NULL) { - empty = PyUnicode_New(0, 0); + empty = PyString_FromStringAndSize(NULL, 0); format_spec = empty; } - /* Find the (unbound!) __format__ method */ - meth = _PyObject_LookupSpecial(obj, &PyId___format__); - if (meth == NULL) { - if (!PyErr_Occurred()) - PyErr_Format(PyExc_TypeError, - "Type %.100s doesn't define __format__", - Py_TYPE(obj)->tp_name); + /* Check the format_spec type, and make sure it's str or unicode */ +#ifdef Py_USING_UNICODE + if (PyUnicode_Check(format_spec)) + spec_is_unicode = 1; + else if (PyString_Check(format_spec)) + spec_is_unicode = 0; + else { +#else + if (!PyString_Check(format_spec)) { +#endif + PyErr_Format(PyExc_TypeError, + "format expects arg 2 to be string " + "or unicode, not %.100s", Py_TYPE(format_spec)->tp_name); goto done; } - /* And call it. */ - result = _PyObject_CallOneArg(meth, format_spec); - Py_DECREF(meth); + /* Check for a __format__ method and call it. */ + if (PyInstance_Check(obj)) { + /* We're an instance of a classic class */ + PyObject *bound_method = PyObject_GetAttrString(obj, "__format__"); + if (bound_method != NULL) { + result = PyObject_CallFunctionObjArgs(bound_method, + format_spec, + NULL); + Py_DECREF(bound_method); + } else { + PyObject *self_as_str = NULL; + PyObject *format_method = NULL; + Py_ssize_t format_len; + + PyErr_Clear(); + /* Per the PEP, convert to str (or unicode, + depending on the type of the format + specifier). For new-style classes, this + logic is done by object.__format__(). */ +#ifdef Py_USING_UNICODE + if (spec_is_unicode) { + format_len = PyUnicode_GET_SIZE(format_spec); + self_as_str = PyObject_Unicode(obj); + } else +#endif + { + format_len = PyString_GET_SIZE(format_spec); + self_as_str = PyObject_Str(obj); + } + if (self_as_str == NULL) + goto done1; + + if (format_len > 0) { + /* See the almost identical code in + typeobject.c for new-style + classes. */ + if (PyErr_WarnEx( + PyExc_PendingDeprecationWarning, + "object.__format__ with a non-empty " + "format string is deprecated", 1) + < 0) { + goto done1; + } + /* Eventually this will become an + error: + PyErr_Format(PyExc_TypeError, + "non-empty format string passed to " + "object.__format__"); + goto done1; + */ + } + + /* Then call str.__format__ on that result */ + format_method = PyObject_GetAttrString(self_as_str, "__format__"); + if (format_method == NULL) { + goto done1; + } + result = PyObject_CallFunctionObjArgs(format_method, + format_spec, + NULL); +done1: + Py_XDECREF(self_as_str); + Py_XDECREF(format_method); + if (result == NULL) + goto done; + } + } else { + /* Not an instance of a classic class, use the code + from py3k */ + static PyObject *format_cache = NULL; + + /* Find the (unbound!) __format__ method (a borrowed + reference) */ + PyObject *method = _PyObject_LookupSpecial(obj, "__format__", + &format_cache); + if (method == NULL) { + if (!PyErr_Occurred()) + PyErr_Format(PyExc_TypeError, + "Type %.100s doesn't define __format__", + Py_TYPE(obj)->tp_name); + goto done; + } + /* And call it. */ + result = PyObject_CallFunctionObjArgs(method, format_spec, NULL); + Py_DECREF(method); + } + + if (result == NULL) + goto done; - if (result && !PyUnicode_Check(result)) { + /* Check the result type, and make sure it's str or unicode */ +#ifdef Py_USING_UNICODE + if (PyUnicode_Check(result)) + result_is_unicode = 1; + else if (PyString_Check(result)) + result_is_unicode = 0; + else { +#else + if (!PyString_Check(result)) { +#endif PyErr_Format(PyExc_TypeError, - "__format__ must return a str, not %.200s", - Py_TYPE(result)->tp_name); + "%.100s.__format__ must return string or " + "unicode, not %.100s", Py_TYPE(obj)->tp_name, + Py_TYPE(result)->tp_name); Py_DECREF(result); result = NULL; goto done; } + /* Convert to unicode, if needed. Required if spec is unicode + and result is str */ +#ifdef Py_USING_UNICODE + if (spec_is_unicode && !result_is_unicode) { + PyObject *tmp = PyObject_Unicode(result); + /* This logic works whether or not tmp is NULL */ + Py_DECREF(result); + result = tmp; + } +#endif + done: Py_XDECREF(empty); return result; } + /* Operations on numbers */ int PyNumber_Check(PyObject *o) { return o && o->ob_type->tp_as_number && - (o->ob_type->tp_as_number->nb_index || - o->ob_type->tp_as_number->nb_int || - o->ob_type->tp_as_number->nb_float); + (o->ob_type->tp_as_number->nb_int || + o->ob_type->tp_as_number->nb_float); } /* Binary operators */ +/* New style number protocol support */ + #define NB_SLOT(x) offsetof(PyNumberMethods, x) #define NB_BINOP(nb_methods, slot) \ (*(binaryfunc*)(& ((char*)nb_methods)[slot])) @@ -818,11 +900,23 @@ PyNumber_Check(PyObject *o) /* Calling scheme used for binary operations: - Order operations are tried until either a valid result or error: - w.op(v,w)[*], v.op(v,w), w.op(v,w) + v w Action + ------------------------------------------------------------------- + new new w.op(v,w)[*], v.op(v,w), w.op(v,w) + new old v.op(v,w), coerce(v,w), v.op(v,w) + old new w.op(v,w), coerce(v,w), v.op(v,w) + old old coerce(v,w), v.op(v,w) [*] only when v->ob_type != w->ob_type && w->ob_type is a subclass of v->ob_type + + Legend: + ------- + * new == new style number + * old == old style number + * Action indicates the order in which operations are tried until either + a valid result is produced or an error occurs. + */ static PyObject * @@ -832,10 +926,10 @@ binary_op1(PyObject *v, PyObject *w, const int op_slot) binaryfunc slotv = NULL; binaryfunc slotw = NULL; - if (v->ob_type->tp_as_number != NULL) + if (v->ob_type->tp_as_number != NULL && NEW_STYLE_NUMBER(v)) slotv = NB_BINOP(v->ob_type->tp_as_number, op_slot); if (w->ob_type != v->ob_type && - w->ob_type->tp_as_number != NULL) { + w->ob_type->tp_as_number != NULL && NEW_STYLE_NUMBER(w)) { slotw = NB_BINOP(w->ob_type->tp_as_number, op_slot); if (slotw == slotv) slotw = NULL; @@ -859,7 +953,30 @@ binary_op1(PyObject *v, PyObject *w, const int op_slot) return x; Py_DECREF(x); /* can't do it */ } - Py_RETURN_NOTIMPLEMENTED; + if (!NEW_STYLE_NUMBER(v) || !NEW_STYLE_NUMBER(w)) { + int err = PyNumber_CoerceEx(&v, &w); + if (err < 0) { + return NULL; + } + if (err == 0) { + PyNumberMethods *mv = v->ob_type->tp_as_number; + if (mv) { + binaryfunc slot; + slot = NB_BINOP(mv, op_slot); + if (slot) { + x = slot(v, w); + Py_DECREF(v); + Py_DECREF(w); + return x; + } + } + /* CoerceEx incremented the reference counts */ + Py_DECREF(v); + Py_DECREF(w); + } + } + Py_INCREF(Py_NotImplemented); + return Py_NotImplemented; } static PyObject * @@ -880,21 +997,6 @@ binary_op(PyObject *v, PyObject *w, const int op_slot, const char *op_name) PyObject *result = binary_op1(v, w, op_slot); if (result == Py_NotImplemented) { Py_DECREF(result); - - if (op_slot == NB_SLOT(nb_rshift) && - PyCFunction_Check(v) && - strcmp(((PyCFunctionObject *)v)->m_ml->ml_name, "print") == 0) - { - PyErr_Format(PyExc_TypeError, - "unsupported operand type(s) for %.100s: " - "'%.100s' and '%.100s'. Did you mean \"print(<message>, " - "file=<output_stream>)\"?", - op_name, - v->ob_type->tp_name, - w->ob_type->tp_name); - return NULL; - } - return binop_type_error(v, w, op_name); } return result; @@ -904,8 +1006,29 @@ binary_op(PyObject *v, PyObject *w, const int op_slot, const char *op_name) /* Calling scheme used for ternary operations: - Order operations are tried until either a valid result or error: - v.op(v,w,z), w.op(v,w,z), z.op(v,w,z) + *** In some cases, w.op is called before v.op; see binary_op1. *** + + v w z Action + ------------------------------------------------------------------- + new new new v.op(v,w,z), w.op(v,w,z), z.op(v,w,z) + new old new v.op(v,w,z), z.op(v,w,z), coerce(v,w,z), v.op(v,w,z) + old new new w.op(v,w,z), z.op(v,w,z), coerce(v,w,z), v.op(v,w,z) + old old new z.op(v,w,z), coerce(v,w,z), v.op(v,w,z) + new new old v.op(v,w,z), w.op(v,w,z), coerce(v,w,z), v.op(v,w,z) + new old old v.op(v,w,z), coerce(v,w,z), v.op(v,w,z) + old new old w.op(v,w,z), coerce(v,w,z), v.op(v,w,z) + old old old coerce(v,w,z), v.op(v,w,z) + + Legend: + ------- + * new == new style number + * old == old style number + * Action indicates the order in which operations are tried until either + a valid result is produced or an error occurs. + * coerce(v,w,z) actually does: coerce(v,w), coerce(v,z), coerce(w,z) and + only if z != Py_None; if z == Py_None, then it is treated as absent + variable and only coerce(v,w) is tried. + */ static PyObject * @@ -923,10 +1046,10 @@ ternary_op(PyObject *v, mv = v->ob_type->tp_as_number; mw = w->ob_type->tp_as_number; - if (mv != NULL) + if (mv != NULL && NEW_STYLE_NUMBER(v)) slotv = NB_TERNOP(mv, op_slot); if (w->ob_type != v->ob_type && - mw != NULL) { + mw != NULL && NEW_STYLE_NUMBER(w)) { slotw = NB_TERNOP(mw, op_slot); if (slotw == slotv) slotw = NULL; @@ -951,7 +1074,7 @@ ternary_op(PyObject *v, Py_DECREF(x); /* can't do it */ } mz = z->ob_type->tp_as_number; - if (mz != NULL) { + if (mz != NULL && NEW_STYLE_NUMBER(z)) { slotz = NB_TERNOP(mz, op_slot); if (slotz == slotv || slotz == slotw) slotz = NULL; @@ -963,6 +1086,66 @@ ternary_op(PyObject *v, } } + if (!NEW_STYLE_NUMBER(v) || !NEW_STYLE_NUMBER(w) || + (z != Py_None && !NEW_STYLE_NUMBER(z))) { + /* we have an old style operand, coerce */ + PyObject *v1, *z1, *w2, *z2; + int c; + + c = PyNumber_Coerce(&v, &w); + if (c != 0) + goto error3; + + /* Special case: if the third argument is None, it is + treated as absent argument and not coerced. */ + if (z == Py_None) { + if (v->ob_type->tp_as_number) { + slotz = NB_TERNOP(v->ob_type->tp_as_number, + op_slot); + if (slotz) + x = slotz(v, w, z); + else + c = -1; + } + else + c = -1; + goto error2; + } + v1 = v; + z1 = z; + c = PyNumber_Coerce(&v1, &z1); + if (c != 0) + goto error2; + w2 = w; + z2 = z1; + c = PyNumber_Coerce(&w2, &z2); + if (c != 0) + goto error1; + + if (v1->ob_type->tp_as_number != NULL) { + slotv = NB_TERNOP(v1->ob_type->tp_as_number, + op_slot); + if (slotv) + x = slotv(v1, w2, z2); + else + c = -1; + } + else + c = -1; + + Py_DECREF(w2); + Py_DECREF(z2); + error1: + Py_DECREF(v1); + Py_DECREF(z1); + error2: + Py_DECREF(v); + Py_DECREF(w); + error3: + if (c >= 0) + return x; + } + if (z == Py_None) PyErr_Format( PyExc_TypeError, @@ -993,6 +1176,7 @@ BINARY_FUNC(PyNumber_And, nb_and, "&") BINARY_FUNC(PyNumber_Lshift, nb_lshift, "<<") BINARY_FUNC(PyNumber_Rshift, nb_rshift, ">>") BINARY_FUNC(PyNumber_Subtract, nb_subtract, "-") +BINARY_FUNC(PyNumber_Divide, nb_divide, "/") BINARY_FUNC(PyNumber_Divmod, nb_divmod, "divmod()") PyObject * @@ -1046,20 +1230,16 @@ PyNumber_Multiply(PyObject *v, PyObject *w) } PyObject * -PyNumber_MatrixMultiply(PyObject *v, PyObject *w) -{ - return binary_op(v, w, NB_SLOT(nb_matrix_multiply), "@"); -} - -PyObject * PyNumber_FloorDivide(PyObject *v, PyObject *w) { + /* XXX tp_flags test */ return binary_op(v, w, NB_SLOT(nb_floor_divide), "//"); } PyObject * PyNumber_TrueDivide(PyObject *v, PyObject *w) { + /* XXX tp_flags test */ return binary_op(v, w, NB_SLOT(nb_true_divide), "/"); } @@ -1091,11 +1271,14 @@ PyNumber_Power(PyObject *v, PyObject *w, PyObject *z) */ +#define HASINPLACE(t) \ + PyType_HasFeature((t)->ob_type, Py_TPFLAGS_HAVE_INPLACEOPS) + static PyObject * binary_iop1(PyObject *v, PyObject *w, const int iop_slot, const int op_slot) { PyNumberMethods *mv = v->ob_type->tp_as_number; - if (mv != NULL) { + if (mv != NULL && HASINPLACE(v)) { binaryfunc slot = NB_BINOP(mv, iop_slot); if (slot) { PyObject *x = (slot)(v, w); @@ -1132,11 +1315,12 @@ INPLACE_BINOP(PyNumber_InPlaceAnd, nb_inplace_and, nb_and, "&=") INPLACE_BINOP(PyNumber_InPlaceLshift, nb_inplace_lshift, nb_lshift, "<<=") INPLACE_BINOP(PyNumber_InPlaceRshift, nb_inplace_rshift, nb_rshift, ">>=") INPLACE_BINOP(PyNumber_InPlaceSubtract, nb_inplace_subtract, nb_subtract, "-=") -INPLACE_BINOP(PyNumber_InMatrixMultiply, nb_inplace_matrix_multiply, nb_matrix_multiply, "@=") +INPLACE_BINOP(PyNumber_InPlaceDivide, nb_inplace_divide, nb_divide, "/=") PyObject * PyNumber_InPlaceFloorDivide(PyObject *v, PyObject *w) { + /* XXX tp_flags test */ return binary_iop(v, w, NB_SLOT(nb_inplace_floor_divide), NB_SLOT(nb_floor_divide), "//="); } @@ -1144,6 +1328,7 @@ PyNumber_InPlaceFloorDivide(PyObject *v, PyObject *w) PyObject * PyNumber_InPlaceTrueDivide(PyObject *v, PyObject *w) { + /* XXX tp_flags test */ return binary_iop(v, w, NB_SLOT(nb_inplace_true_divide), NB_SLOT(nb_true_divide), "/="); } @@ -1158,7 +1343,8 @@ PyNumber_InPlaceAdd(PyObject *v, PyObject *w) Py_DECREF(result); if (m != NULL) { binaryfunc f = NULL; - f = m->sq_inplace_concat; + if (HASINPLACE(v)) + f = m->sq_inplace_concat; if (f == NULL) f = m->sq_concat; if (f != NULL) @@ -1180,7 +1366,8 @@ PyNumber_InPlaceMultiply(PyObject *v, PyObject *w) PySequenceMethods *mw = w->ob_type->tp_as_sequence; Py_DECREF(result); if (mv != NULL) { - f = mv->sq_inplace_repeat; + if (HASINPLACE(v)) + f = mv->sq_inplace_repeat; if (f == NULL) f = mv->sq_repeat; if (f != NULL) @@ -1199,13 +1386,6 @@ PyNumber_InPlaceMultiply(PyObject *v, PyObject *w) } PyObject * -PyNumber_InPlaceMatrixMultiply(PyObject *v, PyObject *w) -{ - return binary_iop(v, w, NB_SLOT(nb_inplace_matrix_multiply), - NB_SLOT(nb_matrix_multiply), "@="); -} - -PyObject * PyNumber_InPlaceRemainder(PyObject *v, PyObject *w) { return binary_iop(v, w, NB_SLOT(nb_inplace_remainder), @@ -1215,7 +1395,7 @@ PyNumber_InPlaceRemainder(PyObject *v, PyObject *w) PyObject * PyNumber_InPlacePower(PyObject *v, PyObject *w, PyObject *z) { - if (v->ob_type->tp_as_number && + if (HASINPLACE(v) && v->ob_type->tp_as_number && v->ob_type->tp_as_number->nb_inplace_power != NULL) { return ternary_op(v, w, z, NB_SLOT(nb_inplace_power), "**="); } @@ -1232,10 +1412,8 @@ PyNumber_Negative(PyObject *o) { PyNumberMethods *m; - if (o == NULL) { + if (o == NULL) return null_error(); - } - m = o->ob_type->tp_as_number; if (m && m->nb_negative) return (*m->nb_negative)(o); @@ -1248,10 +1426,8 @@ PyNumber_Positive(PyObject *o) { PyNumberMethods *m; - if (o == NULL) { + if (o == NULL) return null_error(); - } - m = o->ob_type->tp_as_number; if (m && m->nb_positive) return (*m->nb_positive)(o); @@ -1264,10 +1440,8 @@ PyNumber_Invert(PyObject *o) { PyNumberMethods *m; - if (o == NULL) { + if (o == NULL) return null_error(); - } - m = o->ob_type->tp_as_number; if (m && m->nb_invert) return (*m->nb_invert)(o); @@ -1280,10 +1454,8 @@ PyNumber_Absolute(PyObject *o) { PyNumberMethods *m; - if (o == NULL) { + if (o == NULL) return null_error(); - } - m = o->ob_type->tp_as_number; if (m && m->nb_absolute) return m->nb_absolute(o); @@ -1291,55 +1463,54 @@ PyNumber_Absolute(PyObject *o) return type_error("bad operand type for abs(): '%.200s'", o); } -#undef PyIndex_Check - -int -PyIndex_Check(PyObject *obj) +/* Add a check for embedded NULL-bytes in the argument. */ +static PyObject * +int_from_string(const char *s, Py_ssize_t len) { - return obj->ob_type->tp_as_number != NULL && - obj->ob_type->tp_as_number->nb_index != NULL; + char *end; + PyObject *x; + + x = PyInt_FromString((char*)s, &end, 10); + if (x == NULL) + return NULL; + if (end != s + len) { + PyErr_SetString(PyExc_ValueError, + "null byte in argument for int()"); + Py_DECREF(x); + return NULL; + } + return x; } -/* Return a Python int from the object item. - Raise TypeError if the result is not an int +/* Return a Python Int or Long from the object item + Raise TypeError if the result is not an int-or-long or if the object cannot be interpreted as an index. */ PyObject * PyNumber_Index(PyObject *item) { PyObject *result = NULL; - if (item == NULL) { + if (item == NULL) return null_error(); - } - - if (PyLong_Check(item)) { + if (_PyAnyInt_Check(item)) { Py_INCREF(item); return item; } - if (!PyIndex_Check(item)) { - PyErr_Format(PyExc_TypeError, - "'%.200s' object cannot be interpreted " - "as an integer", item->ob_type->tp_name); - return NULL; + if (PyIndex_Check(item)) { + result = item->ob_type->tp_as_number->nb_index(item); + if (result && !_PyAnyInt_Check(result)) { + PyErr_Format(PyExc_TypeError, + "__index__ returned non-(int,long) " \ + "(type %.200s)", + result->ob_type->tp_name); + Py_DECREF(result); + return NULL; + } } - result = item->ob_type->tp_as_number->nb_index(item); - if (!result || PyLong_CheckExact(result)) - return result; - if (!PyLong_Check(result)) { + else { PyErr_Format(PyExc_TypeError, - "__index__ returned non-int (type %.200s)", - result->ob_type->tp_name); - Py_DECREF(result); - return NULL; - } - /* Issue #17576: warn if 'result' not of exact type int. */ - if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1, - "__index__ returned non-int (type %.200s). " - "The ability to return an instance of a strict subclass of int " - "is deprecated, and may be removed in a future version of Python.", - result->ob_type->tp_name)) { - Py_DECREF(result); - return NULL; + "'%.200s' object cannot be interpreted " + "as an index", item->ob_type->tp_name); } return result; } @@ -1355,8 +1526,8 @@ PyNumber_AsSsize_t(PyObject *item, PyObject *err) if (value == NULL) return -1; - /* We're done if PyLong_AsSsize_t() returns without error. */ - result = PyLong_AsSsize_t(value); + /* We're done if PyInt_AsSsize_t() returns without error. */ + result = PyInt_AsSsize_t(value); if (result != -1 || !(runerr = PyErr_Occurred())) goto finish; @@ -1392,102 +1563,227 @@ PyNumber_AsSsize_t(PyObject *item, PyObject *err) PyObject * -PyNumber_Long(PyObject *o) +_PyNumber_ConvertIntegralToInt(PyObject *integral, const char* error_format) +{ + const char *type_name; + static PyObject *int_name = NULL; + if (int_name == NULL) { + int_name = PyString_InternFromString("__int__"); + if (int_name == NULL) + return NULL; + } + + if (integral && !_PyAnyInt_Check(integral)) { + /* Don't go through tp_as_number->nb_int to avoid + hitting the classic class fallback to __trunc__. */ + PyObject *int_func = PyObject_GetAttr(integral, int_name); + if (int_func == NULL) { + PyErr_Clear(); /* Raise a different error. */ + goto non_integral_error; + } + Py_DECREF(integral); + integral = PyEval_CallObject(int_func, NULL); + Py_DECREF(int_func); + if (integral && !_PyAnyInt_Check(integral)) { + goto non_integral_error; + } + } + return integral; + +non_integral_error: + if (PyInstance_Check(integral)) { + type_name = PyString_AS_STRING(((PyInstanceObject *)integral) + ->in_class->cl_name); + } + else { + type_name = integral->ob_type->tp_name; + } + PyErr_Format(PyExc_TypeError, error_format, type_name); + Py_DECREF(integral); + return NULL; +} + + +PyObject * +PyNumber_Int(PyObject *o) { - PyObject *result; PyNumberMethods *m; + static PyObject *trunc_name = NULL; PyObject *trunc_func; - Py_buffer view; - _Py_IDENTIFIER(__trunc__); + const char *buffer; + Py_ssize_t buffer_len; - if (o == NULL) { - return null_error(); + if (trunc_name == NULL) { + trunc_name = PyString_InternFromString("__trunc__"); + if (trunc_name == NULL) + return NULL; } - if (PyLong_CheckExact(o)) { + if (o == NULL) + return null_error(); + if (PyInt_CheckExact(o)) { Py_INCREF(o); return o; } m = o->ob_type->tp_as_number; if (m && m->nb_int) { /* This should include subclasses of int */ - result = _PyLong_FromNbInt(o); - if (result != NULL && !PyLong_CheckExact(result)) { - Py_SETREF(result, _PyLong_Copy((PyLongObject *)result)); + /* Classic classes always take this branch. */ + PyObject *res = m->nb_int(o); + if (res && !_PyAnyInt_Check(res)) { + PyErr_Format(PyExc_TypeError, + "__int__ returned non-int (type %.200s)", + res->ob_type->tp_name); + Py_DECREF(res); + return NULL; } - return result; + return res; } - if (m && m->nb_index) { - result = _PyLong_FromNbIndexOrNbInt(o); - if (result != NULL && !PyLong_CheckExact(result)) { - Py_SETREF(result, _PyLong_Copy((PyLongObject *)result)); - } - return result; + if (PyInt_Check(o)) { /* An int subclass without nb_int */ + PyIntObject *io = (PyIntObject*)o; + return PyInt_FromLong(io->ob_ival); } - trunc_func = _PyObject_LookupSpecial(o, &PyId___trunc__); + trunc_func = PyObject_GetAttr(o, trunc_name); if (trunc_func) { - result = _PyObject_CallNoArg(trunc_func); + PyObject *truncated = PyEval_CallObject(trunc_func, NULL); Py_DECREF(trunc_func); - if (result == NULL || PyLong_CheckExact(result)) { - return result; - } - if (PyLong_Check(result)) { - Py_SETREF(result, _PyLong_Copy((PyLongObject *)result)); - return result; - } - /* __trunc__ is specified to return an Integral type, - but int() needs to return an int. */ - m = result->ob_type->tp_as_number; - if (m == NULL || (m->nb_index == NULL && m->nb_int == NULL)) { - PyErr_Format( - PyExc_TypeError, - "__trunc__ returned non-Integral (type %.200s)", - result->ob_type->tp_name); - Py_DECREF(result); + /* __trunc__ is specified to return an Integral type, but + int() needs to return an int. */ + return _PyNumber_ConvertIntegralToInt( + truncated, + "__trunc__ returned non-Integral (type %.200s)"); + } + PyErr_Clear(); /* It's not an error if o.__trunc__ doesn't exist. */ + + if (PyString_Check(o)) + return int_from_string(PyString_AS_STRING(o), + PyString_GET_SIZE(o)); +#ifdef Py_USING_UNICODE + if (PyUnicode_Check(o)) + return PyInt_FromUnicode(PyUnicode_AS_UNICODE(o), + PyUnicode_GET_SIZE(o), + 10); +#endif + if (!PyObject_AsCharBuffer(o, &buffer, &buffer_len)) { + PyObject *result, *str; + + /* Copy to NUL-terminated buffer. */ + str = PyString_FromStringAndSize((const char *)buffer, buffer_len); + if (str == NULL) return NULL; - } - Py_SETREF(result, _PyLong_FromNbIndexOrNbInt(result)); - if (result != NULL && !PyLong_CheckExact(result)) { - Py_SETREF(result, _PyLong_Copy((PyLongObject *)result)); - } + result = int_from_string(PyString_AS_STRING(str), buffer_len); + Py_DECREF(str); return result; } - if (PyErr_Occurred()) + + return type_error("int() argument must be a string or a " + "number, not '%.200s'", o); +} + +/* Add a check for embedded NULL-bytes in the argument. */ +static PyObject * +long_from_string(const char *s, Py_ssize_t len) +{ + char *end; + PyObject *x; + + x = PyLong_FromString((char*)s, &end, 10); + if (x == NULL) return NULL; + if (end != s + len) { + PyErr_SetString(PyExc_ValueError, + "null byte in argument for long()"); + Py_DECREF(x); + return NULL; + } + return x; +} - if (PyUnicode_Check(o)) - /* The below check is done in PyLong_FromUnicode(). */ - return PyLong_FromUnicodeObject(o, 10); +PyObject * +PyNumber_Long(PyObject *o) +{ + PyNumberMethods *m; + static PyObject *trunc_name = NULL; + PyObject *trunc_func; + const char *buffer; + Py_ssize_t buffer_len; - if (PyBytes_Check(o)) - /* need to do extra error checking that PyLong_FromString() - * doesn't do. In particular int('9\x005') must raise an - * exception, not truncate at the null. - */ - return _PyLong_FromBytes(PyBytes_AS_STRING(o), - PyBytes_GET_SIZE(o), 10); + if (trunc_name == NULL) { + trunc_name = PyString_InternFromString("__trunc__"); + if (trunc_name == NULL) + return NULL; + } - if (PyByteArray_Check(o)) - return _PyLong_FromBytes(PyByteArray_AS_STRING(o), - PyByteArray_GET_SIZE(o), 10); + if (o == NULL) + return null_error(); + m = o->ob_type->tp_as_number; + if (m && m->nb_long) { /* This should include subclasses of long */ + /* Classic classes always take this branch. */ + PyObject *res = m->nb_long(o); + if (res == NULL) + return NULL; + if (PyInt_Check(res)) { + long value = PyInt_AS_LONG(res); + Py_DECREF(res); + return PyLong_FromLong(value); + } + else if (!PyLong_Check(res)) { + PyErr_Format(PyExc_TypeError, + "__long__ returned non-long (type %.200s)", + res->ob_type->tp_name); + Py_DECREF(res); + return NULL; + } + return res; + } + if (PyLong_Check(o)) /* A long subclass without nb_long */ + return _PyLong_Copy((PyLongObject *)o); + trunc_func = PyObject_GetAttr(o, trunc_name); + if (trunc_func) { + PyObject *truncated = PyEval_CallObject(trunc_func, NULL); + PyObject *int_instance; + Py_DECREF(trunc_func); + /* __trunc__ is specified to return an Integral type, + but long() needs to return a long. */ + int_instance = _PyNumber_ConvertIntegralToInt( + truncated, + "__trunc__ returned non-Integral (type %.200s)"); + if (int_instance && PyInt_Check(int_instance)) { + /* Make sure that long() returns a long instance. */ + long value = PyInt_AS_LONG(int_instance); + Py_DECREF(int_instance); + return PyLong_FromLong(value); + } + return int_instance; + } + PyErr_Clear(); /* It's not an error if o.__trunc__ doesn't exist. */ - if (PyObject_GetBuffer(o, &view, PyBUF_SIMPLE) == 0) { - PyObject *bytes; + if (PyString_Check(o)) + /* need to do extra error checking that PyLong_FromString() + * doesn't do. In particular long('9.5') must raise an + * exception, not truncate the float. + */ + return long_from_string(PyString_AS_STRING(o), + PyString_GET_SIZE(o)); +#ifdef Py_USING_UNICODE + if (PyUnicode_Check(o)) + /* The above check is done in PyLong_FromUnicode(). */ + return PyLong_FromUnicode(PyUnicode_AS_UNICODE(o), + PyUnicode_GET_SIZE(o), + 10); +#endif + if (!PyObject_AsCharBuffer(o, &buffer, &buffer_len)) { + PyObject *result, *str; /* Copy to NUL-terminated buffer. */ - bytes = PyBytes_FromStringAndSize((const char *)view.buf, view.len); - if (bytes == NULL) { - PyBuffer_Release(&view); + str = PyString_FromStringAndSize((const char *)buffer, buffer_len); + if (str == NULL) return NULL; - } - result = _PyLong_FromBytes(PyBytes_AS_STRING(bytes), - PyBytes_GET_SIZE(bytes), 10); - Py_DECREF(bytes); - PyBuffer_Release(&view); + result = long_from_string(PyString_AS_STRING(str), buffer_len); + Py_DECREF(str); return result; } - - return type_error("int() argument must be a string, a bytes-like object " - "or a number, not '%.200s'", o); + return type_error("long() argument must be a string or a " + "number, not '%.200s'", o); } PyObject * @@ -1495,60 +1791,27 @@ PyNumber_Float(PyObject *o) { PyNumberMethods *m; - if (o == NULL) { + if (o == NULL) return null_error(); - } - - if (PyFloat_CheckExact(o)) { - Py_INCREF(o); - return o; - } m = o->ob_type->tp_as_number; if (m && m->nb_float) { /* This should include subclasses of float */ PyObject *res = m->nb_float(o); - double val; - if (!res || PyFloat_CheckExact(res)) { - return res; - } - if (!PyFloat_Check(res)) { + if (res && !PyFloat_Check(res)) { PyErr_Format(PyExc_TypeError, - "%.50s.__float__ returned non-float (type %.50s)", - o->ob_type->tp_name, res->ob_type->tp_name); + "__float__ returned non-float (type %.200s)", + res->ob_type->tp_name); Py_DECREF(res); return NULL; } - /* Issue #26983: warn if 'res' not of exact type float. */ - if (PyErr_WarnFormat(PyExc_DeprecationWarning, 1, - "%.50s.__float__ returned non-float (type %.50s). " - "The ability to return an instance of a strict subclass of float " - "is deprecated, and may be removed in a future version of Python.", - o->ob_type->tp_name, res->ob_type->tp_name)) { - Py_DECREF(res); - return NULL; - } - val = PyFloat_AS_DOUBLE(res); - Py_DECREF(res); - return PyFloat_FromDouble(val); - } - if (m && m->nb_index) { - PyObject *res = PyNumber_Index(o); - if (!res) { - return NULL; - } - double val = PyLong_AsDouble(res); - Py_DECREF(res); - if (val == -1.0 && PyErr_Occurred()) { - return NULL; - } - return PyFloat_FromDouble(val); + return res; } if (PyFloat_Check(o)) { /* A float subclass with nb_float == NULL */ - return PyFloat_FromDouble(PyFloat_AS_DOUBLE(o)); + PyFloatObject *po = (PyFloatObject *)o; + return PyFloat_FromDouble(po->ob_fval); } - return PyFloat_FromString(o); + return PyFloat_FromString(o, NULL); } - PyObject * PyNumber_ToBase(PyObject *n, int base) { @@ -1558,12 +1821,15 @@ PyNumber_ToBase(PyObject *n, int base) if (!index) return NULL; if (PyLong_Check(index)) - res = _PyLong_Format(index, base); + res = _PyLong_Format(index, base, 0, 1); + else if (PyInt_Check(index)) + res = _PyInt_Format((PyIntObject*)index, base, 1); else /* It should not be possible to get here, as PyNumber_Index already has a check for the same condition */ - PyErr_SetString(PyExc_ValueError, "PyNumber_ToBase: index not int"); + PyErr_SetString(PyExc_ValueError, "PyNumber_ToBase: index not " + "int or long"); Py_DECREF(index); return res; } @@ -1574,9 +1840,13 @@ PyNumber_ToBase(PyObject *n, int base) int PySequence_Check(PyObject *s) { + if (s == NULL) + return 0; + if (PyInstance_Check(s)) + return PyObject_HasAttrString(s, "__getitem__"); if (PyDict_Check(s)) return 0; - return s->ob_type->tp_as_sequence && + return s->ob_type->tp_as_sequence && s->ob_type->tp_as_sequence->sq_item != NULL; } @@ -1591,16 +1861,9 @@ PySequence_Size(PyObject *s) } m = s->ob_type->tp_as_sequence; - if (m && m->sq_length) { - Py_ssize_t len = m->sq_length(s); - assert(len >= 0 || PyErr_Occurred()); - return len; - } + if (m && m->sq_length) + return m->sq_length(s); - if (s->ob_type->tp_as_mapping && s->ob_type->tp_as_mapping->mp_length) { - type_error("%.200s is not a sequence", s); - return -1; - } type_error("object of type '%.200s' has no len()", s); return -1; } @@ -1618,16 +1881,15 @@ PySequence_Concat(PyObject *s, PyObject *o) { PySequenceMethods *m; - if (s == NULL || o == NULL) { + if (s == NULL || o == NULL) return null_error(); - } m = s->ob_type->tp_as_sequence; if (m && m->sq_concat) return m->sq_concat(s, o); /* Instances of user classes defining an __add__() method only - have an nb_add slot, not an sq_concat slot. So we fall back + have an nb_add slot, not an sq_concat slot. So we fall back to nb_add if both arguments appear to be sequences. */ if (PySequence_Check(s) && PySequence_Check(o)) { PyObject *result = binary_op1(s, o, NB_SLOT(nb_add)); @@ -1643,9 +1905,8 @@ PySequence_Repeat(PyObject *o, Py_ssize_t count) { PySequenceMethods *m; - if (o == NULL) { + if (o == NULL) return null_error(); - } m = o->ob_type->tp_as_sequence; if (m && m->sq_repeat) @@ -1656,7 +1917,7 @@ PySequence_Repeat(PyObject *o, Py_ssize_t count) to nb_multiply if o appears to be a sequence. */ if (PySequence_Check(o)) { PyObject *n, *result; - n = PyLong_FromSsize_t(count); + n = PyInt_FromSsize_t(count); if (n == NULL) return NULL; result = binary_op1(o, n, NB_SLOT(nb_multiply)); @@ -1673,12 +1934,11 @@ PySequence_InPlaceConcat(PyObject *s, PyObject *o) { PySequenceMethods *m; - if (s == NULL || o == NULL) { + if (s == NULL || o == NULL) return null_error(); - } m = s->ob_type->tp_as_sequence; - if (m && m->sq_inplace_concat) + if (m && HASINPLACE(s) && m->sq_inplace_concat) return m->sq_inplace_concat(s, o); if (m && m->sq_concat) return m->sq_concat(s, o); @@ -1698,19 +1958,18 @@ PySequence_InPlaceRepeat(PyObject *o, Py_ssize_t count) { PySequenceMethods *m; - if (o == NULL) { + if (o == NULL) return null_error(); - } m = o->ob_type->tp_as_sequence; - if (m && m->sq_inplace_repeat) + if (m && HASINPLACE(o) && m->sq_inplace_repeat) return m->sq_inplace_repeat(o, count); if (m && m->sq_repeat) return m->sq_repeat(o, count); if (PySequence_Check(o)) { PyObject *n, *result; - n = PyLong_FromSsize_t(count); + n = PyInt_FromSsize_t(count); if (n == NULL) return NULL; result = binary_iop1(o, n, NB_SLOT(nb_inplace_multiply), @@ -1728,42 +1987,48 @@ PySequence_GetItem(PyObject *s, Py_ssize_t i) { PySequenceMethods *m; - if (s == NULL) { + if (s == NULL) return null_error(); - } m = s->ob_type->tp_as_sequence; if (m && m->sq_item) { if (i < 0) { if (m->sq_length) { Py_ssize_t l = (*m->sq_length)(s); - if (l < 0) { - assert(PyErr_Occurred()); + if (l < 0) return NULL; - } i += l; } } return m->sq_item(s, i); } - if (s->ob_type->tp_as_mapping && s->ob_type->tp_as_mapping->mp_subscript) { - return type_error("%.200s is not a sequence", s); - } return type_error("'%.200s' object does not support indexing", s); } PyObject * PySequence_GetSlice(PyObject *s, Py_ssize_t i1, Py_ssize_t i2) { + PySequenceMethods *m; PyMappingMethods *mp; - if (!s) { - return null_error(); - } + if (!s) return null_error(); - mp = s->ob_type->tp_as_mapping; - if (mp && mp->mp_subscript) { + m = s->ob_type->tp_as_sequence; + if (m && m->sq_slice) { + if (i1 < 0 || i2 < 0) { + if (m->sq_length) { + Py_ssize_t l = (*m->sq_length)(s); + if (l < 0) + return NULL; + if (i1 < 0) + i1 += l; + if (i2 < 0) + i2 += l; + } + } + return m->sq_slice(s, i1, i2); + } else if ((mp = s->ob_type->tp_as_mapping) && mp->mp_subscript) { PyObject *res; PyObject *slice = _PySlice_FromIndices(i1, i2); if (!slice) @@ -1791,20 +2056,14 @@ PySequence_SetItem(PyObject *s, Py_ssize_t i, PyObject *o) if (i < 0) { if (m->sq_length) { Py_ssize_t l = (*m->sq_length)(s); - if (l < 0) { - assert(PyErr_Occurred()); + if (l < 0) return -1; - } i += l; } } return m->sq_ass_item(s, i, o); } - if (s->ob_type->tp_as_mapping && s->ob_type->tp_as_mapping->mp_ass_subscript) { - type_error("%.200s is not a sequence", s); - return -1; - } type_error("'%.200s' object does not support item assignment", s); return -1; } @@ -1824,20 +2083,14 @@ PySequence_DelItem(PyObject *s, Py_ssize_t i) if (i < 0) { if (m->sq_length) { Py_ssize_t l = (*m->sq_length)(s); - if (l < 0) { - assert(PyErr_Occurred()); + if (l < 0) return -1; - } i += l; } } return m->sq_ass_item(s, i, (PyObject *)NULL); } - if (s->ob_type->tp_as_mapping && s->ob_type->tp_as_mapping->mp_ass_subscript) { - type_error("%.200s is not a sequence", s); - return -1; - } type_error("'%.200s' object doesn't support item deletion", s); return -1; } @@ -1845,6 +2098,7 @@ PySequence_DelItem(PyObject *s, Py_ssize_t i) int PySequence_SetSlice(PyObject *s, Py_ssize_t i1, Py_ssize_t i2, PyObject *o) { + PySequenceMethods *m; PyMappingMethods *mp; if (s == NULL) { @@ -1852,8 +2106,21 @@ PySequence_SetSlice(PyObject *s, Py_ssize_t i1, Py_ssize_t i2, PyObject *o) return -1; } - mp = s->ob_type->tp_as_mapping; - if (mp && mp->mp_ass_subscript) { + m = s->ob_type->tp_as_sequence; + if (m && m->sq_ass_slice) { + if (i1 < 0 || i2 < 0) { + if (m->sq_length) { + Py_ssize_t l = (*m->sq_length)(s); + if (l < 0) + return -1; + if (i1 < 0) + i1 += l; + if (i2 < 0) + i2 += l; + } + } + return m->sq_ass_slice(s, i1, i2, o); + } else if ((mp = s->ob_type->tp_as_mapping) && mp->mp_ass_subscript) { int res; PyObject *slice = _PySlice_FromIndices(i1, i2); if (!slice) @@ -1870,22 +2137,27 @@ PySequence_SetSlice(PyObject *s, Py_ssize_t i1, Py_ssize_t i2, PyObject *o) int PySequence_DelSlice(PyObject *s, Py_ssize_t i1, Py_ssize_t i2) { - PyMappingMethods *mp; + PySequenceMethods *m; if (s == NULL) { null_error(); return -1; } - mp = s->ob_type->tp_as_mapping; - if (mp && mp->mp_ass_subscript) { - int res; - PyObject *slice = _PySlice_FromIndices(i1, i2); - if (!slice) - return -1; - res = mp->mp_ass_subscript(s, slice, NULL); - Py_DECREF(slice); - return res; + m = s->ob_type->tp_as_sequence; + if (m && m->sq_ass_slice) { + if (i1 < 0 || i2 < 0) { + if (m->sq_length) { + Py_ssize_t l = (*m->sq_length)(s); + if (l < 0) + return -1; + if (i1 < 0) + i1 += l; + if (i2 < 0) + i2 += l; + } + } + return m->sq_ass_slice(s, i1, i2, (PyObject *)NULL); } type_error("'%.200s' object doesn't support slice deletion", s); return -1; @@ -1895,13 +2167,12 @@ PyObject * PySequence_Tuple(PyObject *v) { PyObject *it; /* iter(v) */ - Py_ssize_t n; /* guess for result tuple size */ + Py_ssize_t n; /* guess for result tuple size */ PyObject *result = NULL; Py_ssize_t j; - if (v == NULL) { + if (v == NULL) return null_error(); - } /* Special-case the common tuple and list cases, for efficiency. */ if (PyTuple_CheckExact(v)) { @@ -1921,7 +2192,7 @@ PySequence_Tuple(PyObject *v) return NULL; /* Guess result size and allocate space. */ - n = PyObject_LengthHint(v, 10); + n = _PyObject_LengthHint(v, 10); if (n == -1) goto Fail; result = PyTuple_New(n); @@ -1979,11 +2250,10 @@ PyObject * PySequence_List(PyObject *v) { PyObject *result; /* result list */ - PyObject *rv; /* return value from PyList_Extend */ + PyObject *rv; /* return value from PyList_Extend */ - if (v == NULL) { + if (v == NULL) return null_error(); - } result = PyList_New(0); if (result == NULL) @@ -2003,9 +2273,8 @@ PySequence_Fast(PyObject *v, const char *m) { PyObject *it; - if (v == NULL) { + if (v == NULL) return null_error(); - } if (PyList_CheckExact(v) || PyTuple_CheckExact(v)) { Py_INCREF(v); @@ -2059,7 +2328,7 @@ _PySequence_IterSearch(PyObject *seq, PyObject *obj, int operation) break; } - cmp = PyObject_RichCompareBool(item, obj, Py_EQ); + cmp = PyObject_RichCompareBool(obj, item, Py_EQ); Py_DECREF(item); if (cmp < 0) goto Fail; @@ -2087,7 +2356,7 @@ _PySequence_IterSearch(PyObject *seq, PyObject *obj, int operation) goto Done; default: - Py_UNREACHABLE(); + assert(!"unknown operation"); } } @@ -2127,9 +2396,11 @@ int PySequence_Contains(PyObject *seq, PyObject *ob) { Py_ssize_t result; - PySequenceMethods *sqm = seq->ob_type->tp_as_sequence; - if (sqm != NULL && sqm->sq_contains != NULL) - return (*sqm->sq_contains)(seq, ob); + if (PyType_HasFeature(seq->ob_type, Py_TPFLAGS_HAVE_SEQUENCE_IN)) { + PySequenceMethods *sqm = seq->ob_type->tp_as_sequence; + if (sqm != NULL && sqm->sq_contains != NULL) + return (*sqm->sq_contains)(seq, ob); + } result = _PySequence_IterSearch(seq, ob, PY_ITERSEARCH_CONTAINS); return Py_SAFE_DOWNCAST(result, Py_ssize_t, int); } @@ -2153,8 +2424,13 @@ PySequence_Index(PyObject *s, PyObject *o) int PyMapping_Check(PyObject *o) { - return o && o->ob_type->tp_as_mapping && - o->ob_type->tp_as_mapping->mp_subscript; + if (o && PyInstance_Check(o)) + return PyObject_HasAttrString(o, "__getitem__"); + + return o && o->ob_type->tp_as_mapping && + o->ob_type->tp_as_mapping->mp_subscript && + !(o->ob_type->tp_as_sequence && + o->ob_type->tp_as_sequence->sq_slice); } Py_ssize_t @@ -2168,17 +2444,9 @@ PyMapping_Size(PyObject *o) } m = o->ob_type->tp_as_mapping; - if (m && m->mp_length) { - Py_ssize_t len = m->mp_length(o); - assert(len >= 0 || PyErr_Occurred()); - return len; - } + if (m && m->mp_length) + return m->mp_length(o); - if (o->ob_type->tp_as_sequence && o->ob_type->tp_as_sequence->sq_length) { - type_error("%.200s is not a mapping", o); - return -1; - } - /* PyMapping_Size() can be called from PyObject_Size(). */ type_error("object of type '%.200s' has no len()", o); return -1; } @@ -2192,15 +2460,14 @@ PyMapping_Length(PyObject *o) #define PyMapping_Length PyMapping_Size PyObject * -PyMapping_GetItemString(PyObject *o, const char *key) +PyMapping_GetItemString(PyObject *o, char *key) { PyObject *okey, *r; - if (key == NULL) { + if (key == NULL) return null_error(); - } - okey = PyUnicode_FromString(key); + okey = PyString_FromString(key); if (okey == NULL) return NULL; r = PyObject_GetItem(o, okey); @@ -2209,7 +2476,7 @@ PyMapping_GetItemString(PyObject *o, const char *key) } int -PyMapping_SetItemString(PyObject *o, const char *key, PyObject *value) +PyMapping_SetItemString(PyObject *o, char *key, PyObject *value) { PyObject *okey; int r; @@ -2219,7 +2486,7 @@ PyMapping_SetItemString(PyObject *o, const char *key, PyObject *value) return -1; } - okey = PyUnicode_FromString(key); + okey = PyString_FromString(key); if (okey == NULL) return -1; r = PyObject_SetItem(o, okey, value); @@ -2228,7 +2495,7 @@ PyMapping_SetItemString(PyObject *o, const char *key, PyObject *value) } int -PyMapping_HasKeyString(PyObject *o, const char *key) +PyMapping_HasKeyString(PyObject *o, char *key) { PyObject *v; @@ -2255,83 +2522,265 @@ PyMapping_HasKey(PyObject *o, PyObject *key) return 0; } -/* This function is quite similar to PySequence_Fast(), but specialized to be - a helper for PyMapping_Keys(), PyMapping_Items() and PyMapping_Values(). - */ -static PyObject * -method_output_as_list(PyObject *o, _Py_Identifier *meth_id) +/* Operations on callable objects */ + +/* XXX PyCallable_Check() is in object.c */ + +PyObject * +PyObject_CallObject(PyObject *o, PyObject *a) { - PyObject *it, *result, *meth_output; + return PyEval_CallObjectWithKeywords(o, a, NULL); +} - assert(o != NULL); - meth_output = _PyObject_CallMethodIdNoArgs(o, meth_id); - if (meth_output == NULL || PyList_CheckExact(meth_output)) { - return meth_output; +PyObject * +PyObject_Call(PyObject *func, PyObject *arg, PyObject *kw) +{ + ternaryfunc call; + + if ((call = func->ob_type->tp_call) != NULL) { + PyObject *result; + if (Py_EnterRecursiveCall(" while calling a Python object")) + return NULL; + result = (*call)(func, arg, kw); + Py_LeaveRecursiveCall(); + if (result == NULL && !PyErr_Occurred()) + PyErr_SetString( + PyExc_SystemError, + "NULL result without error in PyObject_Call"); + return result; } - it = PyObject_GetIter(meth_output); - if (it == NULL) { - if (PyErr_ExceptionMatches(PyExc_TypeError)) { - PyErr_Format(PyExc_TypeError, - "%.200s.%U() returned a non-iterable (type %.200s)", - Py_TYPE(o)->tp_name, - meth_id->object, - Py_TYPE(meth_output)->tp_name); - } - Py_DECREF(meth_output); + PyErr_Format(PyExc_TypeError, "'%.200s' object is not callable", + func->ob_type->tp_name); + return NULL; +} + +static PyObject* +call_function_tail(PyObject *callable, PyObject *args) +{ + PyObject *retval; + + if (args == NULL) return NULL; + + if (!PyTuple_Check(args)) { + PyObject *a; + + a = PyTuple_New(1); + if (a == NULL) { + Py_DECREF(args); + return NULL; + } + PyTuple_SET_ITEM(a, 0, args); + args = a; } - Py_DECREF(meth_output); - result = PySequence_List(it); - Py_DECREF(it); - return result; + retval = PyObject_Call(callable, args, NULL); + + Py_DECREF(args); + + return retval; } PyObject * -PyMapping_Keys(PyObject *o) +PyObject_CallFunction(PyObject *callable, char *format, ...) { - _Py_IDENTIFIER(keys); + va_list va; + PyObject *args; - if (o == NULL) { + if (callable == NULL) return null_error(); + + if (format && *format) { + va_start(va, format); + args = Py_VaBuildValue(format, va); + va_end(va); } - if (PyDict_CheckExact(o)) { - return PyDict_Keys(o); + else + args = PyTuple_New(0); + + return call_function_tail(callable, args); +} + +PyObject * +_PyObject_CallFunction_SizeT(PyObject *callable, char *format, ...) +{ + va_list va; + PyObject *args; + + if (callable == NULL) + return null_error(); + + if (format && *format) { + va_start(va, format); + args = _Py_VaBuildValue_SizeT(format, va); + va_end(va); } - return method_output_as_list(o, &PyId_keys); + else + args = PyTuple_New(0); + + return call_function_tail(callable, args); } PyObject * -PyMapping_Items(PyObject *o) +PyObject_CallMethod(PyObject *o, char *name, char *format, ...) { - _Py_IDENTIFIER(items); + va_list va; + PyObject *args; + PyObject *func = NULL; + PyObject *retval = NULL; - if (o == NULL) { + if (o == NULL || name == NULL) return null_error(); + + func = PyObject_GetAttrString(o, name); + if (func == NULL) + return NULL; + + if (!PyCallable_Check(func)) { + type_error("attribute of type '%.200s' is not callable", func); + goto exit; } - if (PyDict_CheckExact(o)) { - return PyDict_Items(o); + + if (format && *format) { + va_start(va, format); + args = Py_VaBuildValue(format, va); + va_end(va); } - return method_output_as_list(o, &PyId_items); + else + args = PyTuple_New(0); + + retval = call_function_tail(func, args); + + exit: + /* args gets consumed in call_function_tail */ + Py_XDECREF(func); + + return retval; } PyObject * -PyMapping_Values(PyObject *o) +_PyObject_CallMethod_SizeT(PyObject *o, char *name, char *format, ...) { - _Py_IDENTIFIER(values); + va_list va; + PyObject *args; + PyObject *func = NULL; + PyObject *retval = NULL; - if (o == NULL) { + if (o == NULL || name == NULL) return null_error(); + + func = PyObject_GetAttrString(o, name); + if (func == NULL) + return NULL; + + if (!PyCallable_Check(func)) { + type_error("attribute of type '%.200s' is not callable", func); + goto exit; + } + + if (format && *format) { + va_start(va, format); + args = _Py_VaBuildValue_SizeT(format, va); + va_end(va); + } + else + args = PyTuple_New(0); + + retval = call_function_tail(func, args); + + exit: + /* args gets consumed in call_function_tail */ + Py_XDECREF(func); + + return retval; +} + + +static PyObject * +objargs_mktuple(va_list va) +{ + int i, n = 0; + va_list countva; + PyObject *result, *tmp; + +#ifdef VA_LIST_IS_ARRAY + memcpy(countva, va, sizeof(va_list)); +#else +#ifdef __va_copy + __va_copy(countva, va); +#else + countva = va; +#endif +#endif + + while (((PyObject *)va_arg(countva, PyObject *)) != NULL) + ++n; + result = PyTuple_New(n); + if (result != NULL && n > 0) { + for (i = 0; i < n; ++i) { + tmp = (PyObject *)va_arg(va, PyObject *); + PyTuple_SET_ITEM(result, i, tmp); + Py_INCREF(tmp); + } } - if (PyDict_CheckExact(o)) { - return PyDict_Values(o); + return result; +} + +PyObject * +PyObject_CallMethodObjArgs(PyObject *callable, PyObject *name, ...) +{ + PyObject *args, *tmp; + va_list vargs; + + if (callable == NULL || name == NULL) + return null_error(); + + callable = PyObject_GetAttr(callable, name); + if (callable == NULL) + return NULL; + + /* count the args */ + va_start(vargs, name); + args = objargs_mktuple(vargs); + va_end(vargs); + if (args == NULL) { + Py_DECREF(callable); + return NULL; } - return method_output_as_list(o, &PyId_values); + tmp = PyObject_Call(callable, args, NULL); + Py_DECREF(args); + Py_DECREF(callable); + + return tmp; } +PyObject * +PyObject_CallFunctionObjArgs(PyObject *callable, ...) +{ + PyObject *args, *tmp; + va_list vargs; + + if (callable == NULL) + return null_error(); + + /* count the args */ + va_start(vargs, callable); + args = objargs_mktuple(vargs); + va_end(vargs); + if (args == NULL) + return NULL; + tmp = PyObject_Call(callable, args, NULL); + Py_DECREF(args); + + return tmp; +} + + /* isinstance(), issubclass() */ -/* abstract_get_bases() has logically 4 return states: +/* abstract_get_bases() has logically 4 return states, with a sort of 0th + * state that will almost never happen. * + * 0. creating the __bases__ static string could get a MemoryError * 1. getattr(cls, '__bases__') could raise an AttributeError * 2. getattr(cls, '__bases__') could raise some other exception * 3. getattr(cls, '__bases__') could return a tuple @@ -2357,13 +2806,21 @@ PyMapping_Values(PyObject *o) static PyObject * abstract_get_bases(PyObject *cls) { - _Py_IDENTIFIER(__bases__); + static PyObject *__bases__ = NULL; PyObject *bases; - Py_ALLOW_RECURSION - (void)_PyObject_LookupAttrId(cls, &PyId___bases__, &bases); - Py_END_ALLOW_RECURSION - if (bases != NULL && !PyTuple_Check(bases)) { + if (__bases__ == NULL) { + __bases__ = PyString_InternFromString("__bases__"); + if (__bases__ == NULL) + return NULL; + } + bases = PyObject_GetAttr(cls, __bases__); + if (bases == NULL) { + if (PyErr_ExceptionMatches(PyExc_AttributeError)) + PyErr_Clear(); + return NULL; + } + if (!PyTuple_Check(bases)) { Py_DECREF(bases); return NULL; } @@ -2426,32 +2883,48 @@ static int recursive_isinstance(PyObject *inst, PyObject *cls) { PyObject *icls; - int retval; - _Py_IDENTIFIER(__class__); + static PyObject *__class__ = NULL; + int retval = 0; + + if (__class__ == NULL) { + __class__ = PyString_InternFromString("__class__"); + if (__class__ == NULL) + return -1; + } - if (PyType_Check(cls)) { + if (PyClass_Check(cls) && PyInstance_Check(inst)) { + PyObject *inclass = + (PyObject*)((PyInstanceObject*)inst)->in_class; + retval = PyClass_IsSubclass(inclass, cls); + } + else if (PyType_Check(cls)) { retval = PyObject_TypeCheck(inst, (PyTypeObject *)cls); if (retval == 0) { - retval = _PyObject_LookupAttrId(inst, &PyId___class__, &icls); - if (icls != NULL) { - if (icls != (PyObject *)(inst->ob_type) && PyType_Check(icls)) { + PyObject *c = PyObject_GetAttr(inst, __class__); + if (c == NULL) { + PyErr_Clear(); + } + else { + if (c != (PyObject *)(inst->ob_type) && + PyType_Check(c)) retval = PyType_IsSubtype( - (PyTypeObject *)icls, + (PyTypeObject *)c, (PyTypeObject *)cls); - } - else { - retval = 0; - } - Py_DECREF(icls); + Py_DECREF(c); } } } else { if (!check_class(cls, - "isinstance() arg 2 must be a type or tuple of types")) + "isinstance() arg 2 must be a class, type," + " or tuple of classes and types")) return -1; - retval = _PyObject_LookupAttrId(inst, &PyId___class__, &icls); - if (icls != NULL) { + icls = PyObject_GetAttr(inst, __class__); + if (icls == NULL) { + PyErr_Clear(); + retval = 0; + } + else { retval = abstract_issubclass(icls, cls); Py_DECREF(icls); } @@ -2460,154 +2933,138 @@ recursive_isinstance(PyObject *inst, PyObject *cls) return retval; } -static int -object_isinstance(PyThreadState *tstate, PyObject *inst, PyObject *cls) +int +PyObject_IsInstance(PyObject *inst, PyObject *cls) { - _Py_IDENTIFIER(__instancecheck__); - PyObject *checker; + static PyObject *name = NULL; /* Quick test for an exact match */ if (Py_TYPE(inst) == (PyTypeObject *)cls) return 1; - /* We know what type's __instancecheck__ does. */ - if (PyType_CheckExact(cls)) { - return recursive_isinstance(inst, cls); - } - if (PyTuple_Check(cls)) { - if (_Py_EnterRecursiveCall(tstate, " in __instancecheck__")) { - return -1; - } - Py_ssize_t n = PyTuple_GET_SIZE(cls); + Py_ssize_t i; + Py_ssize_t n; int r = 0; - for (Py_ssize_t i = 0; i < n; ++i) { + + if (Py_EnterRecursiveCall(" in __instancecheck__")) + return -1; + n = PyTuple_GET_SIZE(cls); + for (i = 0; i < n; ++i) { PyObject *item = PyTuple_GET_ITEM(cls, i); - r = object_isinstance(tstate, inst, item); + r = PyObject_IsInstance(inst, item); if (r != 0) /* either found it, or got an error */ break; } - _Py_LeaveRecursiveCall(tstate); + Py_LeaveRecursiveCall(); return r; } - checker = _PyObject_LookupSpecial(cls, &PyId___instancecheck__); - if (checker != NULL) { - int ok = -1; - if (_Py_EnterRecursiveCall(tstate, " in __instancecheck__")) { + if (!(PyClass_Check(cls) || PyInstance_Check(cls))) { + PyObject *checker; + checker = _PyObject_LookupSpecial(cls, "__instancecheck__", &name); + if (checker != NULL) { + PyObject *res; + int ok = -1; + if (Py_EnterRecursiveCall(" in __instancecheck__")) { + Py_DECREF(checker); + return ok; + } + res = PyObject_CallFunctionObjArgs(checker, inst, NULL); + Py_LeaveRecursiveCall(); Py_DECREF(checker); + if (res != NULL) { + ok = PyObject_IsTrue(res); + Py_DECREF(res); + } return ok; } - PyObject *res = _PyObject_CallOneArg(checker, inst); - _Py_LeaveRecursiveCall(tstate); - Py_DECREF(checker); - if (res != NULL) { - ok = PyObject_IsTrue(res); - Py_DECREF(res); - } - return ok; - } - else if (_PyErr_Occurred(tstate)) { - return -1; + else if (PyErr_Occurred()) + return -1; } - - /* Probably never reached anymore. */ return recursive_isinstance(inst, cls); } - -int -PyObject_IsInstance(PyObject *inst, PyObject *cls) -{ - PyThreadState *tstate = _PyThreadState_GET(); - return object_isinstance(tstate, inst, cls); -} - - static int recursive_issubclass(PyObject *derived, PyObject *cls) { + int retval; + if (PyType_Check(cls) && PyType_Check(derived)) { /* Fast path (non-recursive) */ - return PyType_IsSubtype((PyTypeObject *)derived, (PyTypeObject *)cls); + return PyType_IsSubtype( + (PyTypeObject *)derived, (PyTypeObject *)cls); + } + if (!PyClass_Check(derived) || !PyClass_Check(cls)) { + if (!check_class(derived, + "issubclass() arg 1 must be a class")) + return -1; + + if (!check_class(cls, + "issubclass() arg 2 must be a class" + " or tuple of classes")) + return -1; + retval = abstract_issubclass(derived, cls); + } + else { + /* shortcut */ + if (!(retval = (derived == cls))) + retval = PyClass_IsSubclass(derived, cls); } - if (!check_class(derived, - "issubclass() arg 1 must be a class")) - return -1; - if (!check_class(cls, - "issubclass() arg 2 must be a class" - " or tuple of classes")) - return -1; - return abstract_issubclass(derived, cls); + return retval; } -static int -object_issubclass(PyThreadState *tstate, PyObject *derived, PyObject *cls) +int +PyObject_IsSubclass(PyObject *derived, PyObject *cls) { - _Py_IDENTIFIER(__subclasscheck__); - PyObject *checker; - - /* We know what type's __subclasscheck__ does. */ - if (PyType_CheckExact(cls)) { - /* Quick test for an exact match */ - if (derived == cls) - return 1; - return recursive_issubclass(derived, cls); - } + static PyObject *name = NULL; if (PyTuple_Check(cls)) { + Py_ssize_t i; + Py_ssize_t n; + int r = 0; - if (_Py_EnterRecursiveCall(tstate, " in __subclasscheck__")) { + if (Py_EnterRecursiveCall(" in __subclasscheck__")) return -1; - } - Py_ssize_t n = PyTuple_GET_SIZE(cls); - int r = 0; - for (Py_ssize_t i = 0; i < n; ++i) { + n = PyTuple_GET_SIZE(cls); + for (i = 0; i < n; ++i) { PyObject *item = PyTuple_GET_ITEM(cls, i); - r = object_issubclass(tstate, derived, item); + r = PyObject_IsSubclass(derived, item); if (r != 0) /* either found it, or got an error */ break; } - _Py_LeaveRecursiveCall(tstate); + Py_LeaveRecursiveCall(); return r; } - - checker = _PyObject_LookupSpecial(cls, &PyId___subclasscheck__); - if (checker != NULL) { - int ok = -1; - if (_Py_EnterRecursiveCall(tstate, " in __subclasscheck__")) { + if (!(PyClass_Check(cls) || PyInstance_Check(cls))) { + PyObject *checker; + checker = _PyObject_LookupSpecial(cls, "__subclasscheck__", &name); + if (checker != NULL) { + PyObject *res; + int ok = -1; + if (Py_EnterRecursiveCall(" in __subclasscheck__")) { + Py_DECREF(checker); + return ok; + } + res = PyObject_CallFunctionObjArgs(checker, derived, NULL); + Py_LeaveRecursiveCall(); Py_DECREF(checker); + if (res != NULL) { + ok = PyObject_IsTrue(res); + Py_DECREF(res); + } return ok; } - PyObject *res = _PyObject_CallOneArg(checker, derived); - _Py_LeaveRecursiveCall(tstate); - Py_DECREF(checker); - if (res != NULL) { - ok = PyObject_IsTrue(res); - Py_DECREF(res); + else if (PyErr_Occurred()) { + return -1; } - return ok; - } - else if (_PyErr_Occurred(tstate)) { - return -1; } - - /* Probably never reached anymore. */ return recursive_issubclass(derived, cls); } - -int -PyObject_IsSubclass(PyObject *derived, PyObject *cls) -{ - PyThreadState *tstate = _PyThreadState_GET(); - return object_issubclass(tstate, derived, cls); -} - - int _PyObject_RealIsInstance(PyObject *inst, PyObject *cls) { @@ -2625,9 +3082,9 @@ PyObject * PyObject_GetIter(PyObject *o) { PyTypeObject *t = o->ob_type; - getiterfunc f; - - f = t->tp_iter; + getiterfunc f = NULL; + if (PyType_HasFeature(t, Py_TPFLAGS_HAVE_ITER)) + f = t->tp_iter; if (f == NULL) { if (PySequence_Check(o)) return PySeqIter_New(o); @@ -2647,14 +3104,6 @@ PyObject_GetIter(PyObject *o) } } -#undef PyIter_Check - -int PyIter_Check(PyObject *obj) -{ - return obj->ob_type->tp_iternext != NULL && - obj->ob_type->tp_iternext != &_PyObject_NextNotImplemented; -} - /* Return next item. * If an error occurs, return NULL. PyErr_Occurred() will be true. * If the iteration terminates normally, return NULL and clear the @@ -2673,81 +3122,3 @@ PyIter_Next(PyObject *iter) PyErr_Clear(); return result; } - - -/* - * Flatten a sequence of bytes() objects into a C array of - * NULL terminated string pointers with a NULL char* terminating the array. - * (ie: an argv or env list) - * - * Memory allocated for the returned list is allocated using PyMem_Malloc() - * and MUST be freed by _Py_FreeCharPArray(). - */ -char *const * -_PySequence_BytesToCharpArray(PyObject* self) -{ - char **array; - Py_ssize_t i, argc; - PyObject *item = NULL; - Py_ssize_t size; - - argc = PySequence_Size(self); - if (argc == -1) - return NULL; - - assert(argc >= 0); - - if ((size_t)argc > (PY_SSIZE_T_MAX-sizeof(char *)) / sizeof(char *)) { - PyErr_NoMemory(); - return NULL; - } - - array = PyMem_Malloc((argc + 1) * sizeof(char *)); - if (array == NULL) { - PyErr_NoMemory(); - return NULL; - } - for (i = 0; i < argc; ++i) { - char *data; - item = PySequence_GetItem(self, i); - if (item == NULL) { - /* NULL terminate before freeing. */ - array[i] = NULL; - goto fail; - } - /* check for embedded null bytes */ - if (PyBytes_AsStringAndSize(item, &data, NULL) < 0) { - /* NULL terminate before freeing. */ - array[i] = NULL; - goto fail; - } - size = PyBytes_GET_SIZE(item) + 1; - array[i] = PyMem_Malloc(size); - if (!array[i]) { - PyErr_NoMemory(); - goto fail; - } - memcpy(array[i], data, size); - Py_DECREF(item); - } - array[argc] = NULL; - - return array; - -fail: - Py_XDECREF(item); - _Py_FreeCharPArray(array); - return NULL; -} - - -/* Free's a NULL terminated char** array of C strings. */ -void -_Py_FreeCharPArray(char *const array[]) -{ - Py_ssize_t i; - for (i = 0; array[i] != NULL; ++i) { - PyMem_Free(array[i]); - } - PyMem_Free((void*)array); -} |