mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-25 04:34:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Issue #27358: Optimized merging var-keyword arguments and improved error

Browse source 
message when pass a non-mapping as a var-keyword argument.
This commit is contained in:
Serhiy Storchaka 2016-10-02 11:06:43 +03:00
parent 0a3beffc8f
commit e036ef8fa2
5 changed files with 126 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Include/dictobject.h
View file

@ -132,6 +132,12 @@ PyAPI_FUNC(int) PyDict_Merge(PyObject *mp,
int override);
#ifndef Py_LIMITED_API
/* Like PyDict_Merge, but override can be 0, 1 or 2. If override is 0,
the first occurrence of a key wins, if override is 1, the last occurrence
of a key wins, if override is 2, a KeyError with conflicting key as
argument is raised.
*/
PyAPI_FUNC(int) _PyDict_MergeEx(PyObject *mp, PyObject *other, int override);
PyAPI_FUNC(PyObject *) _PyDictView_Intersect(PyObject* self, PyObject *other);
#endif