Mailman 3 November 2016 - Python-checkins

cpython (2.7): Issue #28820: Fix spelling of “practice” as a noun
by martin.panter 30 Nov '16

30 Nov '16

https://hg.python.org/cpython/rev/4f24641cd030 changeset: 105397:4f24641cd030 branch: 2.7 user: Martin Panter <vadmium+py(a)gmail.com> date: Wed Nov 30 10:18:45 2016 +0000 summary: Issue #28820: Fix spelling of “practice” as a noun files: Doc/howto/urllib2.rst | 2 +- Doc/tutorial/modules.rst | 2 +- Mac/Modules/cg/CFMLateImport.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Doc/howto/urllib2.rst b/Doc/howto/urllib2.rst --- a/Doc/howto/urllib2.rst +++ b/Doc/howto/urllib2.rst @@ -567,7 +567,7 @@ .. [#] For an introduction to the CGI protocol see `Writing Web Applications in Python <http://www.pyzine.com/Issue008/Section_Articles/article_CGIOne.html>`_. .. [#] Google for example. -.. [#] Browser sniffing is a very bad practise for website design - building +.. [#] Browser sniffing is a very bad practice for website design - building sites using web standards is much more sensible. Unfortunately a lot of sites still send different versions to different browsers. .. [#] The user agent for MSIE 6 is diff --git a/Doc/tutorial/modules.rst b/Doc/tutorial/modules.rst --- a/Doc/tutorial/modules.rst +++ b/Doc/tutorial/modules.rst @@ -496,7 +496,7 @@ ``__all__`` is defined.) Although certain modules are designed to export only names that follow certain -patterns when you use ``import *``, it is still considered bad practise in +patterns when you use ``import *``, it is still considered bad practice in production code. Remember, there is nothing wrong with using ``from Package import diff --git a/Mac/Modules/cg/CFMLateImport.c b/Mac/Modules/cg/CFMLateImport.c --- a/Mac/Modules/cg/CFMLateImport.c +++ b/Mac/Modules/cg/CFMLateImport.c @@ -894,7 +894,7 @@ MoreAssertQ(fragToFix->sectionHeaders != nil); MoreAssertQ(fragToFix->loaderSection != nil); MoreAssertQ(fragToFix->section0Base != nil); // Technically, having a nil for these two is not a problem, ... - MoreAssertQ(fragToFix->section1Base != nil); // but in practise it a wildly deviant case and we should know about it. + MoreAssertQ(fragToFix->section1Base != nil); // but in practice it a wildly deviant case and we should know about it. MoreAssertQ(importLibrary != nil); MoreAssertQ(lookup != nil); -- Repository URL: https://hg.python.org/cpython

2 1

cpython: Backed out changeset 7efddbf1aa70
by victor.stinner 30 Nov '16

30 Nov '16

https://hg.python.org/cpython/rev/20bb8babc505 changeset: 105399:20bb8babc505 parent: 105395:7efddbf1aa70 user: Victor Stinner <victor.stinner(a)gmail.com> date: Wed Nov 30 12:10:54 2016 +0100 summary: Backed out changeset 7efddbf1aa70 files: Include/abstract.h | 40 ++-- Include/ceval.h | 4 +- Objects/abstract.c | 236 +++++++++++++++--------------- Objects/typeobject.c | 21 +- 4 files changed, 149 insertions(+), 152 deletions(-) diff --git a/Include/abstract.h b/Include/abstract.h --- a/Include/abstract.h +++ b/Include/abstract.h @@ -257,15 +257,15 @@ /* Declared elsewhere - PyAPI_FUNC(int) PyCallable_Check(PyObject *obj); + PyAPI_FUNC(int) PyCallable_Check(PyObject *o); - Determine if the object, obj, is callable. Return 1 if the + Determine if the object, o, is callable. Return 1 if the object is callable and 0 otherwise. This function always succeeds. */ - PyAPI_FUNC(PyObject *) PyObject_Call(PyObject *func, + PyAPI_FUNC(PyObject *) PyObject_Call(PyObject *callable_object, PyObject *args, PyObject *kwargs); #ifndef Py_LIMITED_API @@ -344,7 +344,7 @@ _PyObject_FastCall((func), &(arg), 1) PyAPI_FUNC(PyObject *) _PyObject_Call_Prepend(PyObject *func, - PyObject *arg0, PyObject *args, + PyObject *obj, PyObject *args, PyObject *kwargs); PyAPI_FUNC(PyObject *) _Py_CheckFunctionResult(PyObject *func, @@ -353,27 +353,27 @@ #endif /* Py_LIMITED_API */ /* - Call a callable Python object, func, with + Call a callable Python object, callable_object, with arguments and keywords arguments. The 'args' argument can not be NULL. */ - PyAPI_FUNC(PyObject *) PyObject_CallObject(PyObject *func, + PyAPI_FUNC(PyObject *) PyObject_CallObject(PyObject *callable_object, PyObject *args); /* - Call a callable Python object, func, with + Call a callable Python object, callable_object, with arguments given by the tuple, args. If no arguments are needed, then args may be NULL. Returns the result of the call on success, or NULL on failure. This is the equivalent of the Python expression: o(*args). */ - PyAPI_FUNC(PyObject *) PyObject_CallFunction(PyObject *func, + PyAPI_FUNC(PyObject *) PyObject_CallFunction(PyObject *callable_object, const char *format, ...); /* - Call a callable Python object, func, with a + Call a callable Python object, callable_object, with a variable number of C arguments. The C arguments are described using a mkvalue-style format string. The format may be NULL, indicating that no arguments are provided. Returns the @@ -382,7 +382,7 @@ */ - PyAPI_FUNC(PyObject *) PyObject_CallMethod(PyObject *obj, + PyAPI_FUNC(PyObject *) PyObject_CallMethod(PyObject *o, const char *method, const char *format, ...); @@ -396,7 +396,7 @@ */ #ifndef Py_LIMITED_API - PyAPI_FUNC(PyObject *) _PyObject_CallMethodId(PyObject *obj, + PyAPI_FUNC(PyObject *) _PyObject_CallMethodId(PyObject *o, _Py_Identifier *method, const char *format, ...); @@ -406,25 +406,25 @@ */ #endif /* !Py_LIMITED_API */ - PyAPI_FUNC(PyObject *) _PyObject_CallFunction_SizeT(PyObject *func, + PyAPI_FUNC(PyObject *) _PyObject_CallFunction_SizeT(PyObject *callable, const char *format, ...); - PyAPI_FUNC(PyObject *) _PyObject_CallMethod_SizeT(PyObject *obj, - const char *method, + PyAPI_FUNC(PyObject *) _PyObject_CallMethod_SizeT(PyObject *o, + const char *name, const char *format, ...); #ifndef Py_LIMITED_API - PyAPI_FUNC(PyObject *) _PyObject_CallMethodId_SizeT(PyObject *obj, - _Py_Identifier *method, + PyAPI_FUNC(PyObject *) _PyObject_CallMethodId_SizeT(PyObject *o, + _Py_Identifier *name, const char *format, ...); #endif /* !Py_LIMITED_API */ - PyAPI_FUNC(PyObject *) PyObject_CallFunctionObjArgs(PyObject *func, + PyAPI_FUNC(PyObject *) PyObject_CallFunctionObjArgs(PyObject *callable, ...); /* - Call a callable Python object, func, with a + Call a callable Python object, callable_object, with a variable number of C arguments. The C arguments are provided as PyObject * values, terminated by a NULL. Returns the result of the call on success, or NULL on failure. This is @@ -432,10 +432,10 @@ */ - PyAPI_FUNC(PyObject *) PyObject_CallMethodObjArgs(PyObject *obj, + PyAPI_FUNC(PyObject *) PyObject_CallMethodObjArgs(PyObject *o, PyObject *method, ...); #ifndef Py_LIMITED_API - PyAPI_FUNC(PyObject *) _PyObject_CallMethodIdObjArgs(PyObject *obj, + PyAPI_FUNC(PyObject *) _PyObject_CallMethodIdObjArgs(PyObject *o, struct _Py_Identifier *method, ...); #endif /* !Py_LIMITED_API */ diff --git a/Include/ceval.h b/Include/ceval.h --- a/Include/ceval.h +++ b/Include/ceval.h @@ -14,10 +14,10 @@ #define PyEval_CallObject(func,arg) \ PyEval_CallObjectWithKeywords(func, arg, (PyObject *)NULL) -PyAPI_FUNC(PyObject *) PyEval_CallFunction(PyObject *func, +PyAPI_FUNC(PyObject *) PyEval_CallFunction(PyObject *obj, const char *format, ...); PyAPI_FUNC(PyObject *) PyEval_CallMethod(PyObject *obj, - const char *method, + const char *methodname, const char *format, ...); #ifndef Py_LIMITED_API diff --git a/Objects/abstract.c b/Objects/abstract.c --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -2173,9 +2173,9 @@ /* XXX PyCallable_Check() is in object.c */ PyObject * -PyObject_CallObject(PyObject *func, PyObject *args) +PyObject_CallObject(PyObject *o, PyObject *a) { - return PyEval_CallObjectWithKeywords(func, args, NULL); + return PyEval_CallObjectWithKeywords(o, a, NULL); } PyObject* @@ -2331,10 +2331,10 @@ return result; } -/* Positional arguments are arg0 followed args: [arg0, *args]. */ +/* Positional arguments are obj followed args. */ PyObject * _PyObject_Call_Prepend(PyObject *func, - PyObject *arg0, PyObject *args, PyObject *kwargs) + PyObject *obj, PyObject *args, PyObject *kwargs) { PyObject *small_stack[8]; PyObject **stack; @@ -2356,7 +2356,7 @@ } /* use borrowed references */ - stack[0] = arg0; + stack[0] = obj; memcpy(&stack[1], &PyTuple_GET_ITEM(args, 0), argcount * sizeof(PyObject *)); @@ -2489,34 +2489,34 @@ } static PyObject* -call_function_tail(PyObject *func, PyObject *args) +call_function_tail(PyObject *callable, PyObject *args) { PyObject *result; assert(args != NULL); if (!PyTuple_Check(args)) { - result = _PyObject_CallArg1(func, args); + result = _PyObject_CallArg1(callable, args); } else { - result = PyObject_Call(func, args, NULL); + result = PyObject_Call(callable, args, NULL); } return result; } PyObject * -PyObject_CallFunction(PyObject *func, const char *format, ...) +PyObject_CallFunction(PyObject *callable, const char *format, ...) { va_list va; PyObject *args, *result; - if (func == NULL) { + if (callable == NULL) { return null_error(); } if (!format || !*format) { - return _PyObject_CallNoArg(func); + return _PyObject_CallNoArg(callable); } va_start(va, format); @@ -2526,23 +2526,23 @@ return NULL; } - result = call_function_tail(func, args); + result = call_function_tail(callable, args); Py_DECREF(args); return result; } PyObject * -_PyObject_CallFunction_SizeT(PyObject *func, const char *format, ...) +_PyObject_CallFunction_SizeT(PyObject *callable, const char *format, ...) { va_list va; PyObject *args, *result; - if (func == NULL) { + if (callable == NULL) { return null_error(); } if (!format || !*format) { - return _PyObject_CallNoArg(func); + return _PyObject_CallNoArg(callable); } va_start(va, format); @@ -2552,7 +2552,7 @@ return NULL; } - result = call_function_tail(func, args); + result = call_function_tail(callable, args); Py_DECREF(args); return result; } @@ -2589,20 +2589,19 @@ } PyObject * -PyObject_CallMethod(PyObject *obj, const char *method, const char *format, ...) +PyObject_CallMethod(PyObject *o, const char *name, const char *format, ...) { va_list va; PyObject *func = NULL; PyObject *retval = NULL; - if (obj == NULL || method == NULL) { + if (o == NULL || name == NULL) { return null_error(); } - func = PyObject_GetAttrString(obj, method); - if (func == NULL) { + func = PyObject_GetAttrString(o, name); + if (func == NULL) return NULL; - } va_start(va, format); retval = callmethod(func, format, va, 0); @@ -2612,20 +2611,20 @@ } PyObject * -_PyObject_CallMethodId(PyObject *obj, _Py_Identifier *method, +_PyObject_CallMethodId(PyObject *o, _Py_Identifier *name, const char *format, ...) { va_list va; - PyObject *func, *retval; - - if (obj == NULL || method == NULL) { + PyObject *func = NULL; + PyObject *retval = NULL; + + if (o == NULL || name == NULL) { return null_error(); } - func = _PyObject_GetAttrId(obj, method); - if (func == NULL) { + func = _PyObject_GetAttrId(o, name); + if (func == NULL) return NULL; - } va_start(va, format); retval = callmethod(func, format, va, 0); @@ -2635,21 +2634,20 @@ } PyObject * -_PyObject_CallMethod_SizeT(PyObject *obj, const char *method, +_PyObject_CallMethod_SizeT(PyObject *o, const char *name, const char *format, ...) { va_list va; - PyObject *func, *retval; - - if (obj == NULL || method == NULL) { + PyObject *func = NULL; + PyObject *retval; + + if (o == NULL || name == NULL) { return null_error(); } - func = PyObject_GetAttrString(obj, method); - if (func == NULL) { + func = PyObject_GetAttrString(o, name); + if (func == NULL) return NULL; - } - va_start(va, format); retval = callmethod(func, format, va, 1); va_end(va); @@ -2658,21 +2656,21 @@ } PyObject * -_PyObject_CallMethodId_SizeT(PyObject *obj, _Py_Identifier *method, +_PyObject_CallMethodId_SizeT(PyObject *o, _Py_Identifier *name, const char *format, ...) { va_list va; - PyObject *func, *retval; - - if (obj == NULL || method == NULL) { + PyObject *func = NULL; + PyObject *retval; + + if (o == NULL || name == NULL) { return null_error(); } - func = _PyObject_GetAttrId(obj, method); + func = _PyObject_GetAttrId(o, name); if (func == NULL) { return NULL; } - va_start(va, format); retval = callmethod(func, format, va, 1); va_end(va); @@ -2722,80 +2720,7 @@ } PyObject * -PyObject_CallMethodObjArgs(PyObject *obj, PyObject *method, ...) -{ - PyObject *small_stack[5]; - PyObject **stack; - Py_ssize_t nargs; - PyObject *func, *result; - va_list vargs; - - if (obj == NULL || method == NULL) { - return null_error(); - } - - func = PyObject_GetAttr(obj, method); - if (func == NULL) - return NULL; - - /* count the args */ - va_start(vargs, method); - stack = objargs_mkstack(small_stack, Py_ARRAY_LENGTH(small_stack), - vargs, &nargs); - va_end(vargs); - if (stack == NULL) { - Py_DECREF(func); - return NULL; - } - - result = _PyObject_FastCall(func, stack, nargs); - Py_DECREF(func); - if (stack != small_stack) { - PyMem_Free(stack); - } - - return result; -} - -PyObject * -_PyObject_CallMethodIdObjArgs(PyObject *obj, - struct _Py_Identifier *method, ...) -{ - PyObject *small_stack[5]; - PyObject **stack; - Py_ssize_t nargs; - PyObject *func, *result; - va_list vargs; - - if (obj == NULL || method == NULL) { - return null_error(); - } - - func = _PyObject_GetAttrId(obj, method); - if (func == NULL) - return NULL; - - /* count the args */ - va_start(vargs, method); - stack = objargs_mkstack(small_stack, Py_ARRAY_LENGTH(small_stack), - vargs, &nargs); - va_end(vargs); - if (stack == NULL) { - Py_DECREF(func); - return NULL; - } - - result = _PyObject_FastCall(func, stack, nargs); - Py_DECREF(func); - if (stack != small_stack) { - PyMem_Free(stack); - } - - return result; -} - -PyObject * -PyObject_CallFunctionObjArgs(PyObject *func, ...) +PyObject_CallMethodObjArgs(PyObject *callable, PyObject *name, ...) { PyObject *small_stack[5]; PyObject **stack; @@ -2803,12 +2728,85 @@ PyObject *result; va_list vargs; - if (func == NULL) { + if (callable == NULL || name == NULL) { return null_error(); } + callable = PyObject_GetAttr(callable, name); + if (callable == NULL) + return NULL; + /* count the args */ - va_start(vargs, func); + va_start(vargs, name); + stack = objargs_mkstack(small_stack, Py_ARRAY_LENGTH(small_stack), + vargs, &nargs); + va_end(vargs); + if (stack == NULL) { + Py_DECREF(callable); + return NULL; + } + + result = _PyObject_FastCall(callable, stack, nargs); + Py_DECREF(callable); + if (stack != small_stack) { + PyMem_Free(stack); + } + + return result; +} + +PyObject * +_PyObject_CallMethodIdObjArgs(PyObject *callable, + struct _Py_Identifier *name, ...) +{ + PyObject *small_stack[5]; + PyObject **stack; + Py_ssize_t nargs; + PyObject *result; + va_list vargs; + + if (callable == NULL || name == NULL) { + return null_error(); + } + + callable = _PyObject_GetAttrId(callable, name); + if (callable == NULL) + return NULL; + + /* count the args */ + va_start(vargs, name); + stack = objargs_mkstack(small_stack, Py_ARRAY_LENGTH(small_stack), + vargs, &nargs); + va_end(vargs); + if (stack == NULL) { + Py_DECREF(callable); + return NULL; + } + + result = _PyObject_FastCall(callable, stack, nargs); + Py_DECREF(callable); + if (stack != small_stack) { + PyMem_Free(stack); + } + + return result; +} + +PyObject * +PyObject_CallFunctionObjArgs(PyObject *callable, ...) +{ + PyObject *small_stack[5]; + PyObject **stack; + Py_ssize_t nargs; + PyObject *result; + va_list vargs; + + if (callable == NULL) { + return null_error(); + } + + /* count the args */ + va_start(vargs, callable); stack = objargs_mkstack(small_stack, Py_ARRAY_LENGTH(small_stack), vargs, &nargs); va_end(vargs); @@ -2816,7 +2814,7 @@ return NULL; } - result = _PyObject_FastCall(func, stack, nargs); + result = _PyObject_FastCall(callable, stack, nargs); if (stack != small_stack) { PyMem_Free(stack); } diff --git a/Objects/typeobject.c b/Objects/typeobject.c --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -1425,16 +1425,15 @@ as lookup_method to cache the interned name string object. */ static PyObject * -call_method(PyObject *obj, _Py_Identifier *method, const char *format, ...) +call_method(PyObject *o, _Py_Identifier *nameid, const char *format, ...) { va_list va; - PyObject *func, *retval; - - func = lookup_maybe(obj, method); + PyObject *func = NULL, *retval; + + func = lookup_maybe(o, nameid); if (func == NULL) { - if (!PyErr_Occurred()) { - PyErr_SetObject(PyExc_AttributeError, method->object); - } + if (!PyErr_Occurred()) + PyErr_SetObject(PyExc_AttributeError, nameid->object); return NULL; } @@ -1466,12 +1465,12 @@ /* Clone of call_method() that returns NotImplemented when the lookup fails. */ static PyObject * -call_maybe(PyObject *obj, _Py_Identifier *method, const char *format, ...) +call_maybe(PyObject *o, _Py_Identifier *nameid, const char *format, ...) { va_list va; - PyObject *func, *retval; - - func = lookup_maybe(obj, method); + PyObject *func = NULL, *retval; + + func = lookup_maybe(o, nameid); if (func == NULL) { if (!PyErr_Occurred()) Py_RETURN_NOTIMPLEMENTED; -- Repository URL: https://hg.python.org/cpython

1 0

cpython (2.7): Issue #25701: Document that some C APIs can both set and delete items
by martin.panter 30 Nov '16

30 Nov '16

https://hg.python.org/cpython/rev/83e3c863594c changeset: 105398:83e3c863594c branch: 2.7 user: Martin Panter <vadmium+py(a)gmail.com> date: Wed Nov 30 10:32:40 2016 +0000 summary: Issue #25701: Document that some C APIs can both set and delete items Also document that using the dedicated functions to delete items is preferred. Using PyObject_SetAttr/String() and PySequence_SetItem/Slice() for deletion is deprecated. files: Doc/c-api/object.rst | 27 +++++++++++++++++++-------- Doc/c-api/sequence.rst | 12 ++++++++++-- Doc/c-api/typeobj.rst | 26 ++++++++++++++++---------- Include/abstract.h | 24 ++++++++++++------------ 4 files changed, 57 insertions(+), 32 deletions(-) diff --git a/Doc/c-api/object.rst b/Doc/c-api/object.rst --- a/Doc/c-api/object.rst +++ b/Doc/c-api/object.rst @@ -55,25 +55,35 @@ .. c:function:: int PyObject_SetAttr(PyObject *o, PyObject *attr_name, PyObject *v) Set the value of the attribute named *attr_name*, for object *o*, to the value - *v*. Returns ``-1`` on failure. This is the equivalent of the Python statement + *v*. Raise an exception and return ``-1`` on failure; + return ``0`` on success. This is the equivalent of the Python statement ``o.attr_name = v``. + If *v* is *NULL*, the attribute is deleted, however this feature is + deprecated in favour of using :c:func:`PyObject_DelAttr`. + .. c:function:: int PyObject_SetAttrString(PyObject *o, const char *attr_name, PyObject *v) Set the value of the attribute named *attr_name*, for object *o*, to the value - *v*. Returns ``-1`` on failure. This is the equivalent of the Python statement + *v*. Raise an exception and return ``-1`` on failure; + return ``0`` on success. This is the equivalent of the Python statement ``o.attr_name = v``. + If *v* is *NULL*, the attribute is deleted, however this feature is + deprecated in favour of using :c:func:`PyObject_DelAttrString`. + .. c:function:: int PyObject_GenericSetAttr(PyObject *o, PyObject *name, PyObject *value) - Generic attribute setter function that is meant to be put into a type - object's ``tp_setattro`` slot. It looks for a data descriptor in the + Generic attribute setter and deleter function that is meant + to be put into a type object's :c:member:`~PyTypeObject.tp_setattro` + slot. It looks for a data descriptor in the dictionary of classes in the object's MRO, and if found it takes preference - over setting the attribute in the instance dictionary. Otherwise, the - attribute is set in the object's :attr:`~object.__dict__` (if present). - Otherwise, an :exc:`AttributeError` is raised and ``-1`` is returned. + over setting or deleting the attribute in the instance dictionary. Otherwise, the + attribute is set or deleted in the object's :attr:`~object.__dict__` (if present). + On success, ``0`` is returned, otherwise an :exc:`AttributeError` + is raised and ``-1`` is returned. .. c:function:: int PyObject_DelAttr(PyObject *o, PyObject *attr_name) @@ -367,7 +377,8 @@ .. c:function:: int PyObject_SetItem(PyObject *o, PyObject *key, PyObject *v) - Map the object *key* to the value *v*. Returns ``-1`` on failure. This is the + Map the object *key* to the value *v*. Raise an exception and + return ``-1`` on failure; return ``0`` on success. This is the equivalent of the Python statement ``o[key] = v``. diff --git a/Doc/c-api/sequence.rst b/Doc/c-api/sequence.rst --- a/Doc/c-api/sequence.rst +++ b/Doc/c-api/sequence.rst @@ -82,10 +82,14 @@ .. c:function:: int PySequence_SetItem(PyObject *o, Py_ssize_t i, PyObject *v) - Assign object *v* to the *i*\ th element of *o*. Returns ``-1`` on failure. This + Assign object *v* to the *i*\ th element of *o*. Raise an exception + and return ``-1`` on failure; return ``0`` on success. This is the equivalent of the Python statement ``o[i] = v``. This function *does not* steal a reference to *v*. + If *v* is *NULL*, the element is deleted, however this feature is + deprecated in favour of using :c:func:`PySequence_DelItem`. + .. versionchanged:: 2.5 This function used an :c:type:`int` type for *i*. This might require changes in your code for properly supporting 64-bit systems. @@ -104,7 +108,11 @@ .. c:function:: int PySequence_SetSlice(PyObject *o, Py_ssize_t i1, Py_ssize_t i2, PyObject *v) Assign the sequence object *v* to the slice in sequence object *o* from *i1* to - *i2*. This is the equivalent of the Python statement ``o[i1:i2] = v``. + *i2*. Raise an exception and return ``-1`` on failure; return ``0`` on success. + This is the equivalent of the Python statement ``o[i1:i2] = v``. + + If *v* is *NULL*, the slice is deleted, however this feature is + deprecated in favour of using :c:func:`PySequence_DelSlice`. .. versionchanged:: 2.5 This function used an :c:type:`int` type for *i1* and *i2*. This might diff --git a/Doc/c-api/typeobj.rst b/Doc/c-api/typeobj.rst --- a/Doc/c-api/typeobj.rst +++ b/Doc/c-api/typeobj.rst @@ -240,12 +240,13 @@ .. c:member:: setattrfunc PyTypeObject.tp_setattr - An optional pointer to the set-attribute-string function. + An optional pointer to the function for setting and deleting attributes. This field is deprecated. When it is defined, it should point to a function that acts the same as the :c:member:`~PyTypeObject.tp_setattro` function, but taking a C string instead of a Python string object to give the attribute name. The signature is - the same as for :c:func:`PyObject_SetAttrString`. + the same as for :c:func:`PyObject_SetAttrString`, but setting + *v* to *NULL* to delete an attribute must be supported. This field is inherited by subtypes together with :c:member:`~PyTypeObject.tp_setattro`: a subtype inherits both :c:member:`~PyTypeObject.tp_setattr` and :c:member:`~PyTypeObject.tp_setattro` from its base type when @@ -389,9 +390,10 @@ .. c:member:: setattrofunc PyTypeObject.tp_setattro - An optional pointer to the set-attribute function. + An optional pointer to the function for setting and deleting attributes. - The signature is the same as for :c:func:`PyObject_SetAttr`. It is usually + The signature is the same as for :c:func:`PyObject_SetAttr`, but setting + *v* to *NULL* to delete an attribute must be supported. It is usually convenient to set this field to :c:func:`PyObject_GenericSetAttr`, which implements the normal way of setting object attributes. @@ -831,7 +833,7 @@ typedef struct PyGetSetDef { char *name; /* attribute name */ getter get; /* C function to get the attribute */ - setter set; /* C function to set the attribute */ + setter set; /* C function to set or delete the attribute */ char *doc; /* optional doc string */ void *closure; /* optional additional data for getter and setter */ } PyGetSetDef; @@ -877,12 +879,14 @@ .. c:member:: descrsetfunc PyTypeObject.tp_descr_set - An optional pointer to a "descriptor set" function. + An optional pointer to a function for setting and deleting + a descriptor's value. The function signature is :: int tp_descr_set(PyObject *self, PyObject *obj, PyObject *value); + The *value* argument is set to *NULL* to delete the value. This field is inherited by subtypes. .. XXX explain. @@ -1263,9 +1267,11 @@ .. c:member:: objobjargproc PyMappingMethods.mp_ass_subscript - This function is used by :c:func:`PyObject_SetItem` and has the same - signature. If this slot is *NULL*, the object does not support item - assignment. + This function is used by :c:func:`PyObject_SetItem` and + :c:func:`PyObject_DelItem`. It has the same signature as + :c:func:`PyObject_SetItem`, but *v* can also be set to *NULL* to delete + an item. If this slot is *NULL*, the object does not support item + assignment and deletion. .. _sequence-structs: @@ -1314,7 +1320,7 @@ This function is used by :c:func:`PySequence_SetItem` and has the same signature. This slot may be left to *NULL* if the object does not support - item assignment. + item assignment and deletion. .. c:member:: objobjproc PySequenceMethods.sq_contains diff --git a/Include/abstract.h b/Include/abstract.h --- a/Include/abstract.h +++ b/Include/abstract.h @@ -191,8 +191,8 @@ int PyObject_SetAttrString(PyObject *o, char *attr_name, PyObject *v); Set the value of the attribute named attr_name, for object o, - to the value, v. Returns -1 on failure. This is - the equivalent of the Python statement: o.attr_name=v. + to the value v. Raise an exception and return -1 on failure; return 0 on + success. This is the equivalent of the Python statement o.attr_name=v. */ @@ -201,8 +201,8 @@ int PyObject_SetAttr(PyObject *o, PyObject *attr_name, PyObject *v); Set the value of the attribute named attr_name, for object o, - to the value, v. Returns -1 on failure. This is - the equivalent of the Python statement: o.attr_name=v. + to the value v. Raise an exception and return -1 on failure; return 0 on + success. This is the equivalent of the Python statement o.attr_name=v. */ @@ -453,9 +453,9 @@ PyAPI_FUNC(int) PyObject_SetItem(PyObject *o, PyObject *key, PyObject *v); /* - Map the object, key, to the value, v. Returns - -1 on failure. This is the equivalent of the Python - statement: o[key]=v. + Map the object key to the value v. Raise an exception and return -1 + on failure; return 0 on success. This is the equivalent of the Python + statement o[key]=v. */ PyAPI_FUNC(int) PyObject_DelItemString(PyObject *o, char *key); @@ -1102,10 +1102,9 @@ PyAPI_FUNC(int) PySequence_SetItem(PyObject *o, Py_ssize_t i, PyObject *v); /* - Assign object v to the ith element of o. Returns - -1 on failure. This is the equivalent of the Python - statement: o[i]=v. - + Assign object v to the ith element of o. Raise an exception and return + -1 on failure; return 0 on success. This is the equivalent of the + Python statement o[i]=v. */ PyAPI_FUNC(int) PySequence_DelItem(PyObject *o, Py_ssize_t i); @@ -1121,7 +1120,8 @@ /* Assign the sequence object, v, to the slice in sequence - object, o, from i1 to i2. Returns -1 on failure. This is the + object, o, from i1 to i2. Raise an exception and return + -1 on failure; return 0 on success. This is the equivalent of the Python statement: o[i1:i2]=v. */ -- Repository URL: https://hg.python.org/cpython

1 0

Daily reference leaks (7efddbf1aa70): sum=4
by solipsis＠pitrou.net 30 Nov '16

30 Nov '16

results for 7efddbf1aa70 on branch "default" -------------------------------------------- test_collections leaked [7, 0, -7] memory blocks, sum=0 test_functools leaked [0, 3, 1] memory blocks, sum=4 test_multiprocessing_forkserver leaked [-2, 2, 0] memory blocks, sum=0 Command line was: ['./python', '-m', 'test.regrtest', '-uall', '-R', '3:3:/home/psf-users/antoine/refleaks/reflogi_8Rur', '--timeout', '7200']

1 0

cpython (2.7): Issue #24469: Fixed memory leak caused by int subclasses without overridden
by serhiy.storchaka 29 Nov '16

29 Nov '16

https://hg.python.org/cpython/rev/fd0842f34602 changeset: 105396:fd0842f34602 branch: 2.7 parent: 105371:59bd48afa1bc user: Serhiy Storchaka <storchaka(a)gmail.com> date: Tue Nov 29 20:49:14 2016 +0200 summary: Issue #24469: Fixed memory leak caused by int subclasses without overridden tp_free (e.g. C-inherited Cython classes). files: Misc/NEWS | 3 +++ Objects/intobject.c | 8 -------- 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/Misc/NEWS b/Misc/NEWS --- a/Misc/NEWS +++ b/Misc/NEWS @@ -10,6 +10,9 @@ Core and Builtins ----------------- +- Issue #24469: Fixed memory leak caused by int subclasses without overridden + tp_free (e.g. C-inherited Cython classes). + - Issue #19398: Extra slash no longer added to sys.path components in case of empty compile-time PYTHONPATH components. diff --git a/Objects/intobject.c b/Objects/intobject.c --- a/Objects/intobject.c +++ b/Objects/intobject.c @@ -139,13 +139,6 @@ Py_TYPE(v)->tp_free((PyObject *)v); } -static void -int_free(PyIntObject *v) -{ - Py_TYPE(v) = (struct _typeobject *)free_list; - free_list = v; -} - long PyInt_AsLong(register PyObject *op) { @@ -1451,7 +1444,6 @@ 0, /* tp_init */ 0, /* tp_alloc */ int_new, /* tp_new */ - (freefunc)int_free, /* tp_free */ }; int -- Repository URL: https://hg.python.org/cpython

1 0

cpython: Uniformize argument names of "call" functions
by victor.stinner 29 Nov '16

29 Nov '16

https://hg.python.org/cpython/rev/7efddbf1aa70 changeset: 105395:7efddbf1aa70 user: Victor Stinner <victor.stinner(a)gmail.com> date: Tue Nov 29 18:47:56 2016 +0100 summary: Uniformize argument names of "call" functions * Callable object: callable, o, callable_object => func * Object for method calls: o => obj * Method name: name or nameid => method Cleanup also the C code: * Don't initialize variables to NULL if they are not used before their first assignement * Add braces for readability files: Include/abstract.h | 40 ++-- Include/ceval.h | 4 +- Objects/abstract.c | 236 +++++++++++++++--------------- Objects/typeobject.c | 21 +- 4 files changed, 152 insertions(+), 149 deletions(-) diff --git a/Include/abstract.h b/Include/abstract.h --- a/Include/abstract.h +++ b/Include/abstract.h @@ -257,15 +257,15 @@ /* Declared elsewhere - PyAPI_FUNC(int) PyCallable_Check(PyObject *o); + PyAPI_FUNC(int) PyCallable_Check(PyObject *obj); - Determine if the object, o, is callable. Return 1 if the + Determine if the object, obj, is callable. Return 1 if the object is callable and 0 otherwise. This function always succeeds. */ - PyAPI_FUNC(PyObject *) PyObject_Call(PyObject *callable_object, + PyAPI_FUNC(PyObject *) PyObject_Call(PyObject *func, PyObject *args, PyObject *kwargs); #ifndef Py_LIMITED_API @@ -344,7 +344,7 @@ _PyObject_FastCall((func), &(arg), 1) PyAPI_FUNC(PyObject *) _PyObject_Call_Prepend(PyObject *func, - PyObject *obj, PyObject *args, + PyObject *arg0, PyObject *args, PyObject *kwargs); PyAPI_FUNC(PyObject *) _Py_CheckFunctionResult(PyObject *func, @@ -353,27 +353,27 @@ #endif /* Py_LIMITED_API */ /* - Call a callable Python object, callable_object, with + Call a callable Python object, func, with arguments and keywords arguments. The 'args' argument can not be NULL. */ - PyAPI_FUNC(PyObject *) PyObject_CallObject(PyObject *callable_object, + PyAPI_FUNC(PyObject *) PyObject_CallObject(PyObject *func, PyObject *args); /* - Call a callable Python object, callable_object, with + Call a callable Python object, func, with arguments given by the tuple, args. If no arguments are needed, then args may be NULL. Returns the result of the call on success, or NULL on failure. This is the equivalent of the Python expression: o(*args). */ - PyAPI_FUNC(PyObject *) PyObject_CallFunction(PyObject *callable_object, + PyAPI_FUNC(PyObject *) PyObject_CallFunction(PyObject *func, const char *format, ...); /* - Call a callable Python object, callable_object, with a + Call a callable Python object, func, with a variable number of C arguments. The C arguments are described using a mkvalue-style format string. The format may be NULL, indicating that no arguments are provided. Returns the @@ -382,7 +382,7 @@ */ - PyAPI_FUNC(PyObject *) PyObject_CallMethod(PyObject *o, + PyAPI_FUNC(PyObject *) PyObject_CallMethod(PyObject *obj, const char *method, const char *format, ...); @@ -396,7 +396,7 @@ */ #ifndef Py_LIMITED_API - PyAPI_FUNC(PyObject *) _PyObject_CallMethodId(PyObject *o, + PyAPI_FUNC(PyObject *) _PyObject_CallMethodId(PyObject *obj, _Py_Identifier *method, const char *format, ...); @@ -406,25 +406,25 @@ */ #endif /* !Py_LIMITED_API */ - PyAPI_FUNC(PyObject *) _PyObject_CallFunction_SizeT(PyObject *callable, + PyAPI_FUNC(PyObject *) _PyObject_CallFunction_SizeT(PyObject *func, const char *format, ...); - PyAPI_FUNC(PyObject *) _PyObject_CallMethod_SizeT(PyObject *o, - const char *name, + PyAPI_FUNC(PyObject *) _PyObject_CallMethod_SizeT(PyObject *obj, + const char *method, const char *format, ...); #ifndef Py_LIMITED_API - PyAPI_FUNC(PyObject *) _PyObject_CallMethodId_SizeT(PyObject *o, - _Py_Identifier *name, + PyAPI_FUNC(PyObject *) _PyObject_CallMethodId_SizeT(PyObject *obj, + _Py_Identifier *method, const char *format, ...); #endif /* !Py_LIMITED_API */ - PyAPI_FUNC(PyObject *) PyObject_CallFunctionObjArgs(PyObject *callable, + PyAPI_FUNC(PyObject *) PyObject_CallFunctionObjArgs(PyObject *func, ...); /* - Call a callable Python object, callable_object, with a + Call a callable Python object, func, with a variable number of C arguments. The C arguments are provided as PyObject * values, terminated by a NULL. Returns the result of the call on success, or NULL on failure. This is @@ -432,10 +432,10 @@ */ - PyAPI_FUNC(PyObject *) PyObject_CallMethodObjArgs(PyObject *o, + PyAPI_FUNC(PyObject *) PyObject_CallMethodObjArgs(PyObject *obj, PyObject *method, ...); #ifndef Py_LIMITED_API - PyAPI_FUNC(PyObject *) _PyObject_CallMethodIdObjArgs(PyObject *o, + PyAPI_FUNC(PyObject *) _PyObject_CallMethodIdObjArgs(PyObject *obj, struct _Py_Identifier *method, ...); #endif /* !Py_LIMITED_API */ diff --git a/Include/ceval.h b/Include/ceval.h --- a/Include/ceval.h +++ b/Include/ceval.h @@ -14,10 +14,10 @@ #define PyEval_CallObject(func,arg) \ PyEval_CallObjectWithKeywords(func, arg, (PyObject *)NULL) -PyAPI_FUNC(PyObject *) PyEval_CallFunction(PyObject *obj, +PyAPI_FUNC(PyObject *) PyEval_CallFunction(PyObject *func, const char *format, ...); PyAPI_FUNC(PyObject *) PyEval_CallMethod(PyObject *obj, - const char *methodname, + const char *method, const char *format, ...); #ifndef Py_LIMITED_API diff --git a/Objects/abstract.c b/Objects/abstract.c --- a/Objects/abstract.c +++ b/Objects/abstract.c @@ -2173,9 +2173,9 @@ /* XXX PyCallable_Check() is in object.c */ PyObject * -PyObject_CallObject(PyObject *o, PyObject *a) +PyObject_CallObject(PyObject *func, PyObject *args) { - return PyEval_CallObjectWithKeywords(o, a, NULL); + return PyEval_CallObjectWithKeywords(func, args, NULL); } PyObject* @@ -2331,10 +2331,10 @@ return result; } -/* Positional arguments are obj followed args. */ +/* Positional arguments are arg0 followed args: [arg0, *args]. */ PyObject * _PyObject_Call_Prepend(PyObject *func, - PyObject *obj, PyObject *args, PyObject *kwargs) + PyObject *arg0, PyObject *args, PyObject *kwargs) { PyObject *small_stack[8]; PyObject **stack; @@ -2356,7 +2356,7 @@ } /* use borrowed references */ - stack[0] = obj; + stack[0] = arg0; memcpy(&stack[1], &PyTuple_GET_ITEM(args, 0), argcount * sizeof(PyObject *)); @@ -2489,34 +2489,34 @@ } static PyObject* -call_function_tail(PyObject *callable, PyObject *args) +call_function_tail(PyObject *func, PyObject *args) { PyObject *result; assert(args != NULL); if (!PyTuple_Check(args)) { - result = _PyObject_CallArg1(callable, args); + result = _PyObject_CallArg1(func, args); } else { - result = PyObject_Call(callable, args, NULL); + result = PyObject_Call(func, args, NULL); } return result; } PyObject * -PyObject_CallFunction(PyObject *callable, const char *format, ...) +PyObject_CallFunction(PyObject *func, const char *format, ...) { va_list va; PyObject *args, *result; - if (callable == NULL) { + if (func == NULL) { return null_error(); } if (!format || !*format) { - return _PyObject_CallNoArg(callable); + return _PyObject_CallNoArg(func); } va_start(va, format); @@ -2526,23 +2526,23 @@ return NULL; } - result = call_function_tail(callable, args); + result = call_function_tail(func, args); Py_DECREF(args); return result; } PyObject * -_PyObject_CallFunction_SizeT(PyObject *callable, const char *format, ...) +_PyObject_CallFunction_SizeT(PyObject *func, const char *format, ...) { va_list va; PyObject *args, *result; - if (callable == NULL) { + if (func == NULL) { return null_error(); } if (!format || !*format) { - return _PyObject_CallNoArg(callable); + return _PyObject_CallNoArg(func); } va_start(va, format); @@ -2552,7 +2552,7 @@ return NULL; } - result = call_function_tail(callable, args); + result = call_function_tail(func, args); Py_DECREF(args); return result; } @@ -2589,19 +2589,20 @@ } PyObject * -PyObject_CallMethod(PyObject *o, const char *name, const char *format, ...) +PyObject_CallMethod(PyObject *obj, const char *method, const char *format, ...) { va_list va; PyObject *func = NULL; PyObject *retval = NULL; - if (o == NULL || name == NULL) { + if (obj == NULL || method == NULL) { return null_error(); } - func = PyObject_GetAttrString(o, name); - if (func == NULL) + func = PyObject_GetAttrString(obj, method); + if (func == NULL) { return NULL; + } va_start(va, format); retval = callmethod(func, format, va, 0); @@ -2611,20 +2612,20 @@ } PyObject * -_PyObject_CallMethodId(PyObject *o, _Py_Identifier *name, +_PyObject_CallMethodId(PyObject *obj, _Py_Identifier *method, const char *format, ...) { va_list va; - PyObject *func = NULL; - PyObject *retval = NULL; - - if (o == NULL || name == NULL) { + PyObject *func, *retval; + + if (obj == NULL || method == NULL) { return null_error(); } - func = _PyObject_GetAttrId(o, name); - if (func == NULL) + func = _PyObject_GetAttrId(obj, method); + if (func == NULL) { return NULL; + } va_start(va, format); retval = callmethod(func, format, va, 0); @@ -2634,20 +2635,21 @@ } PyObject * -_PyObject_CallMethod_SizeT(PyObject *o, const char *name, +_PyObject_CallMethod_SizeT(PyObject *obj, const char *method, const char *format, ...) { va_list va; - PyObject *func = NULL; - PyObject *retval; - - if (o == NULL || name == NULL) { + PyObject *func, *retval; + + if (obj == NULL || method == NULL) { return null_error(); } - func = PyObject_GetAttrString(o, name); - if (func == NULL) + func = PyObject_GetAttrString(obj, method); + if (func == NULL) { return NULL; + } + va_start(va, format); retval = callmethod(func, format, va, 1); va_end(va); @@ -2656,21 +2658,21 @@ } PyObject * -_PyObject_CallMethodId_SizeT(PyObject *o, _Py_Identifier *name, +_PyObject_CallMethodId_SizeT(PyObject *obj, _Py_Identifier *method, const char *format, ...) { va_list va; - PyObject *func = NULL; - PyObject *retval; - - if (o == NULL || name == NULL) { + PyObject *func, *retval; + + if (obj == NULL || method == NULL) { return null_error(); } - func = _PyObject_GetAttrId(o, name); + func = _PyObject_GetAttrId(obj, method); if (func == NULL) { return NULL; } + va_start(va, format); retval = callmethod(func, format, va, 1); va_end(va); @@ -2720,7 +2722,80 @@ } PyObject * -PyObject_CallMethodObjArgs(PyObject *callable, PyObject *name, ...) +PyObject_CallMethodObjArgs(PyObject *obj, PyObject *method, ...) +{ + PyObject *small_stack[5]; + PyObject **stack; + Py_ssize_t nargs; + PyObject *func, *result; + va_list vargs; + + if (obj == NULL || method == NULL) { + return null_error(); + } + + func = PyObject_GetAttr(obj, method); + if (func == NULL) + return NULL; + + /* count the args */ + va_start(vargs, method); + stack = objargs_mkstack(small_stack, Py_ARRAY_LENGTH(small_stack), + vargs, &nargs); + va_end(vargs); + if (stack == NULL) { + Py_DECREF(func); + return NULL; + } + + result = _PyObject_FastCall(func, stack, nargs); + Py_DECREF(func); + if (stack != small_stack) { + PyMem_Free(stack); + } + + return result; +} + +PyObject * +_PyObject_CallMethodIdObjArgs(PyObject *obj, + struct _Py_Identifier *method, ...) +{ + PyObject *small_stack[5]; + PyObject **stack; + Py_ssize_t nargs; + PyObject *func, *result; + va_list vargs; + + if (obj == NULL || method == NULL) { + return null_error(); + } + + func = _PyObject_GetAttrId(obj, method); + if (func == NULL) + return NULL; + + /* count the args */ + va_start(vargs, method); + stack = objargs_mkstack(small_stack, Py_ARRAY_LENGTH(small_stack), + vargs, &nargs); + va_end(vargs); + if (stack == NULL) { + Py_DECREF(func); + return NULL; + } + + result = _PyObject_FastCall(func, stack, nargs); + Py_DECREF(func); + if (stack != small_stack) { + PyMem_Free(stack); + } + + return result; +} + +PyObject * +PyObject_CallFunctionObjArgs(PyObject *func, ...) { PyObject *small_stack[5]; PyObject **stack; @@ -2728,85 +2803,12 @@ PyObject *result; va_list vargs; - if (callable == NULL || name == NULL) { + if (func == NULL) { return null_error(); } - callable = PyObject_GetAttr(callable, name); - if (callable == NULL) - return NULL; - /* count the args */ - va_start(vargs, name); - stack = objargs_mkstack(small_stack, Py_ARRAY_LENGTH(small_stack), - vargs, &nargs); - va_end(vargs); - if (stack == NULL) { - Py_DECREF(callable); - return NULL; - } - - result = _PyObject_FastCall(callable, stack, nargs); - Py_DECREF(callable); - if (stack != small_stack) { - PyMem_Free(stack); - } - - return result; -} - -PyObject * -_PyObject_CallMethodIdObjArgs(PyObject *callable, - struct _Py_Identifier *name, ...) -{ - PyObject *small_stack[5]; - PyObject **stack; - Py_ssize_t nargs; - PyObject *result; - va_list vargs; - - if (callable == NULL || name == NULL) { - return null_error(); - } - - callable = _PyObject_GetAttrId(callable, name); - if (callable == NULL) - return NULL; - - /* count the args */ - va_start(vargs, name); - stack = objargs_mkstack(small_stack, Py_ARRAY_LENGTH(small_stack), - vargs, &nargs); - va_end(vargs); - if (stack == NULL) { - Py_DECREF(callable); - return NULL; - } - - result = _PyObject_FastCall(callable, stack, nargs); - Py_DECREF(callable); - if (stack != small_stack) { - PyMem_Free(stack); - } - - return result; -} - -PyObject * -PyObject_CallFunctionObjArgs(PyObject *callable, ...) -{ - PyObject *small_stack[5]; - PyObject **stack; - Py_ssize_t nargs; - PyObject *result; - va_list vargs; - - if (callable == NULL) { - return null_error(); - } - - /* count the args */ - va_start(vargs, callable); + va_start(vargs, func); stack = objargs_mkstack(small_stack, Py_ARRAY_LENGTH(small_stack), vargs, &nargs); va_end(vargs); @@ -2814,7 +2816,7 @@ return NULL; } - result = _PyObject_FastCall(callable, stack, nargs); + result = _PyObject_FastCall(func, stack, nargs); if (stack != small_stack) { PyMem_Free(stack); } diff --git a/Objects/typeobject.c b/Objects/typeobject.c --- a/Objects/typeobject.c +++ b/Objects/typeobject.c @@ -1425,15 +1425,16 @@ as lookup_method to cache the interned name string object. */ static PyObject * -call_method(PyObject *o, _Py_Identifier *nameid, const char *format, ...) +call_method(PyObject *obj, _Py_Identifier *method, const char *format, ...) { va_list va; - PyObject *func = NULL, *retval; - - func = lookup_maybe(o, nameid); + PyObject *func, *retval; + + func = lookup_maybe(obj, method); if (func == NULL) { - if (!PyErr_Occurred()) - PyErr_SetObject(PyExc_AttributeError, nameid->object); + if (!PyErr_Occurred()) { + PyErr_SetObject(PyExc_AttributeError, method->object); + } return NULL; } @@ -1465,12 +1466,12 @@ /* Clone of call_method() that returns NotImplemented when the lookup fails. */ static PyObject * -call_maybe(PyObject *o, _Py_Identifier *nameid, const char *format, ...) +call_maybe(PyObject *obj, _Py_Identifier *method, const char *format, ...) { va_list va; - PyObject *func = NULL, *retval; - - func = lookup_maybe(o, nameid); + PyObject *func, *retval; + + func = lookup_maybe(obj, method); if (func == NULL) { if (!PyErr_Occurred()) Py_RETURN_NOTIMPLEMENTED; -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.6 -> default): Issue #28790: Fix error when using Generic and __slots__ (Ivan L) (3.6->3.7)
by guido.van.rossum 29 Nov '16

29 Nov '16

https://hg.python.org/cpython/rev/b9915ca4b3da changeset: 105394:b9915ca4b3da parent: 105391:c9a348edf8d2 parent: 105393:2dd08b5b5ee6 user: Guido van Rossum <guido(a)python.org> date: Tue Nov 29 09:46:29 2016 -0800 summary: Issue #28790: Fix error when using Generic and __slots__ (Ivan L) (3.6->3.7) files: Lib/test/test_typing.py | 38 +++++++++++++++++++++++++++++ Lib/typing.py | 18 +++++++++++-- 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py --- a/Lib/test/test_typing.py +++ b/Lib/test/test_typing.py @@ -896,6 +896,44 @@ self.assertEqual(t, copy(t)) self.assertEqual(t, deepcopy(t)) + def test_parameterized_slots(self): + T = TypeVar('T') + class C(Generic[T]): + __slots__ = ('potato',) + + c = C() + c_int = C[int]() + self.assertEqual(C.__slots__, C[str].__slots__) + + c.potato = 0 + c_int.potato = 0 + with self.assertRaises(AttributeError): + c.tomato = 0 + with self.assertRaises(AttributeError): + c_int.tomato = 0 + + def foo(x: C['C']): ... + self.assertEqual(get_type_hints(foo, globals(), locals())['x'], C[C]) + self.assertEqual(get_type_hints(foo, globals(), locals())['x'].__slots__, + C.__slots__) + self.assertEqual(copy(C[int]), deepcopy(C[int])) + + def test_parameterized_slots_dict(self): + T = TypeVar('T') + class D(Generic[T]): + __slots__ = {'banana': 42} + + d = D() + d_int = D[int]() + self.assertEqual(D.__slots__, D[str].__slots__) + + d.banana = 'yes' + d_int.banana = 'yes' + with self.assertRaises(AttributeError): + d.foobar = 'no' + with self.assertRaises(AttributeError): + d_int.foobar = 'no' + def test_errors(self): with self.assertRaises(TypeError): B = SimpleMapping[XK, Any] diff --git a/Lib/typing.py b/Lib/typing.py --- a/Lib/typing.py +++ b/Lib/typing.py @@ -870,6 +870,17 @@ return __extrahook__ +def _no_slots_copy(dct): + """Internal helper: copy class __dict__ and clean slots class variables. + (They will be re-created if necessary by normal class machinery.) + """ + dict_copy = dict(dct) + if '__slots__' in dict_copy: + for slot in dict_copy['__slots__']: + dict_copy.pop(slot, None) + return dict_copy + + class GenericMeta(TypingMeta, abc.ABCMeta): """Metaclass for generic types.""" @@ -967,7 +978,7 @@ return self return self.__class__(self.__name__, self.__bases__, - dict(self.__dict__), + _no_slots_copy(self.__dict__), tvars=_type_vars(ev_args) if ev_args else None, args=ev_args, origin=ev_origin, @@ -1043,7 +1054,7 @@ args = params return self.__class__(self.__name__, self.__bases__, - dict(self.__dict__), + _no_slots_copy(self.__dict__), tvars=tvars, args=args, origin=self, @@ -1059,7 +1070,8 @@ return issubclass(instance.__class__, self) def __copy__(self): - return self.__class__(self.__name__, self.__bases__, dict(self.__dict__), + return self.__class__(self.__name__, self.__bases__, + _no_slots_copy(self.__dict__), self.__parameters__, self.__args__, self.__origin__, self.__extra__, self.__orig_bases__) -- Repository URL: https://hg.python.org/cpython

1 0

cpython (3.5): Issue #28790: Fix error when using Generic and __slots__ (Ivan L)
by guido.van.rossum 29 Nov '16

29 Nov '16

https://hg.python.org/cpython/rev/0bbd29405c9d changeset: 105392:0bbd29405c9d branch: 3.5 parent: 105374:40567b8e3478 user: Guido van Rossum <guido(a)python.org> date: Tue Nov 29 09:46:21 2016 -0800 summary: Issue #28790: Fix error when using Generic and __slots__ (Ivan L) files: Lib/test/test_typing.py | 38 +++++++++++++++++++++++++++++ Lib/typing.py | 18 +++++++++++-- 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py --- a/Lib/test/test_typing.py +++ b/Lib/test/test_typing.py @@ -896,6 +896,44 @@ self.assertEqual(t, copy(t)) self.assertEqual(t, deepcopy(t)) + def test_parameterized_slots(self): + T = TypeVar('T') + class C(Generic[T]): + __slots__ = ('potato',) + + c = C() + c_int = C[int]() + self.assertEqual(C.__slots__, C[str].__slots__) + + c.potato = 0 + c_int.potato = 0 + with self.assertRaises(AttributeError): + c.tomato = 0 + with self.assertRaises(AttributeError): + c_int.tomato = 0 + + def foo(x: C['C']): ... + self.assertEqual(get_type_hints(foo, globals(), locals())['x'], C[C]) + self.assertEqual(get_type_hints(foo, globals(), locals())['x'].__slots__, + C.__slots__) + self.assertEqual(copy(C[int]), deepcopy(C[int])) + + def test_parameterized_slots_dict(self): + T = TypeVar('T') + class D(Generic[T]): + __slots__ = {'banana': 42} + + d = D() + d_int = D[int]() + self.assertEqual(D.__slots__, D[str].__slots__) + + d.banana = 'yes' + d_int.banana = 'yes' + with self.assertRaises(AttributeError): + d.foobar = 'no' + with self.assertRaises(AttributeError): + d_int.foobar = 'no' + def test_errors(self): with self.assertRaises(TypeError): B = SimpleMapping[XK, Any] diff --git a/Lib/typing.py b/Lib/typing.py --- a/Lib/typing.py +++ b/Lib/typing.py @@ -870,6 +870,17 @@ return __extrahook__ +def _no_slots_copy(dct): + """Internal helper: copy class __dict__ and clean slots class variables. + (They will be re-created if necessary by normal class machinery.) + """ + dict_copy = dict(dct) + if '__slots__' in dict_copy: + for slot in dict_copy['__slots__']: + dict_copy.pop(slot, None) + return dict_copy + + class GenericMeta(TypingMeta, abc.ABCMeta): """Metaclass for generic types.""" @@ -967,7 +978,7 @@ return self return self.__class__(self.__name__, self.__bases__, - dict(self.__dict__), + _no_slots_copy(self.__dict__), tvars=_type_vars(ev_args) if ev_args else None, args=ev_args, origin=ev_origin, @@ -1043,7 +1054,7 @@ args = params return self.__class__(self.__name__, self.__bases__, - dict(self.__dict__), + _no_slots_copy(self.__dict__), tvars=tvars, args=args, origin=self, @@ -1059,7 +1070,8 @@ return issubclass(instance.__class__, self) def __copy__(self): - return self.__class__(self.__name__, self.__bases__, dict(self.__dict__), + return self.__class__(self.__name__, self.__bases__, + _no_slots_copy(self.__dict__), self.__parameters__, self.__args__, self.__origin__, self.__extra__, self.__orig_bases__) -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.5 -> 3.6): Issue #28790: Fix error when using Generic and __slots__ (Ivan L) (3.5->3.6)
by guido.van.rossum 29 Nov '16

29 Nov '16

https://hg.python.org/cpython/rev/2dd08b5b5ee6 changeset: 105393:2dd08b5b5ee6 branch: 3.6 parent: 105390:6d69da76be6a parent: 105392:0bbd29405c9d user: Guido van Rossum <guido(a)python.org> date: Tue Nov 29 09:46:26 2016 -0800 summary: Issue #28790: Fix error when using Generic and __slots__ (Ivan L) (3.5->3.6) files: Lib/test/test_typing.py | 38 +++++++++++++++++++++++++++++ Lib/typing.py | 18 +++++++++++-- 2 files changed, 53 insertions(+), 3 deletions(-) diff --git a/Lib/test/test_typing.py b/Lib/test/test_typing.py --- a/Lib/test/test_typing.py +++ b/Lib/test/test_typing.py @@ -896,6 +896,44 @@ self.assertEqual(t, copy(t)) self.assertEqual(t, deepcopy(t)) + def test_parameterized_slots(self): + T = TypeVar('T') + class C(Generic[T]): + __slots__ = ('potato',) + + c = C() + c_int = C[int]() + self.assertEqual(C.__slots__, C[str].__slots__) + + c.potato = 0 + c_int.potato = 0 + with self.assertRaises(AttributeError): + c.tomato = 0 + with self.assertRaises(AttributeError): + c_int.tomato = 0 + + def foo(x: C['C']): ... + self.assertEqual(get_type_hints(foo, globals(), locals())['x'], C[C]) + self.assertEqual(get_type_hints(foo, globals(), locals())['x'].__slots__, + C.__slots__) + self.assertEqual(copy(C[int]), deepcopy(C[int])) + + def test_parameterized_slots_dict(self): + T = TypeVar('T') + class D(Generic[T]): + __slots__ = {'banana': 42} + + d = D() + d_int = D[int]() + self.assertEqual(D.__slots__, D[str].__slots__) + + d.banana = 'yes' + d_int.banana = 'yes' + with self.assertRaises(AttributeError): + d.foobar = 'no' + with self.assertRaises(AttributeError): + d_int.foobar = 'no' + def test_errors(self): with self.assertRaises(TypeError): B = SimpleMapping[XK, Any] diff --git a/Lib/typing.py b/Lib/typing.py --- a/Lib/typing.py +++ b/Lib/typing.py @@ -870,6 +870,17 @@ return __extrahook__ +def _no_slots_copy(dct): + """Internal helper: copy class __dict__ and clean slots class variables. + (They will be re-created if necessary by normal class machinery.) + """ + dict_copy = dict(dct) + if '__slots__' in dict_copy: + for slot in dict_copy['__slots__']: + dict_copy.pop(slot, None) + return dict_copy + + class GenericMeta(TypingMeta, abc.ABCMeta): """Metaclass for generic types.""" @@ -967,7 +978,7 @@ return self return self.__class__(self.__name__, self.__bases__, - dict(self.__dict__), + _no_slots_copy(self.__dict__), tvars=_type_vars(ev_args) if ev_args else None, args=ev_args, origin=ev_origin, @@ -1043,7 +1054,7 @@ args = params return self.__class__(self.__name__, self.__bases__, - dict(self.__dict__), + _no_slots_copy(self.__dict__), tvars=tvars, args=args, origin=self, @@ -1059,7 +1070,8 @@ return issubclass(instance.__class__, self) def __copy__(self): - return self.__class__(self.__name__, self.__bases__, dict(self.__dict__), + return self.__class__(self.__name__, self.__bases__, + _no_slots_copy(self.__dict__), self.__parameters__, self.__args__, self.__origin__, self.__extra__, self.__orig_bases__) -- Repository URL: https://hg.python.org/cpython

1 0

cpython (merge 3.6 -> default): Null merge 3.6
by victor.stinner 29 Nov '16

29 Nov '16

https://hg.python.org/cpython/rev/c9a348edf8d2 changeset: 105391:c9a348edf8d2 parent: 105389:674fb9644eaa parent: 105390:6d69da76be6a user: Victor Stinner <victor.stinner(a)gmail.com> date: Tue Nov 29 18:22:02 2016 +0100 summary: Null merge 3.6 files: -- Repository URL: https://hg.python.org/cpython

1 0