diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/if_py_both.h | 61 | ||||
| -rw-r--r-- | src/if_python.c | 17 | ||||
| -rw-r--r-- | src/if_python3.c | 9 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 46 insertions, 43 deletions
diff --git a/src/if_py_both.h b/src/if_py_both.h index 59bb0f56d..e31509cff 100644 --- a/src/if_py_both.h +++ b/src/if_py_both.h @@ -4612,10 +4612,9 @@ pymap_to_tv(PyObject *obj, typval_T *tv, PyObject *lookup_dict) char_u *key; dictitem_T *di; PyObject *list; - PyObject *litem; + PyObject *iterator; PyObject *keyObject; PyObject *valObject; - Py_ssize_t lsize; if (!(dict = dict_alloc())) return -1; @@ -4623,61 +4622,52 @@ pymap_to_tv(PyObject *obj, typval_T *tv, PyObject *lookup_dict) tv->v_type = VAR_DICT; tv->vval.v_dict = dict; - list = PyMapping_Items(obj); - if (list == NULL) + if (!(list = PyMapping_Keys(obj))) { dict_unref(dict); return -1; } - lsize = PyList_Size(list); - while (lsize--) - { - DICTKEY_DECL - litem = PyList_GetItem(list, lsize); - if (litem == NULL) - { - Py_DECREF(list); - dict_unref(dict); - return -1; - } + if (!(iterator = PyObject_GetIter(list))) + { + dict_unref(dict); + Py_DECREF(list); + return -1; + } + Py_DECREF(list); - if (!(keyObject = PyTuple_GetItem(litem, 0))) - { - Py_DECREF(list); - Py_DECREF(litem); - dict_unref(dict); - return -1; - } + while ((keyObject = PyIter_Next(iterator))) + { + DICTKEY_DECL if (!DICTKEY_SET_KEY) { + Py_DECREF(iterator); dict_unref(dict); - Py_DECREF(list); - Py_DECREF(litem); DICTKEY_UNREF return -1; } DICTKEY_CHECK_EMPTY(-1) - if (!(valObject = PyTuple_GetItem(litem, 1))) + if (!(valObject = PyObject_GetItem(obj, keyObject))) { - Py_DECREF(list); - Py_DECREF(litem); + Py_DECREF(keyObject); + Py_DECREF(iterator); dict_unref(dict); DICTKEY_UNREF return -1; } - Py_DECREF(litem); - di = dictitem_alloc(key); DICTKEY_UNREF + Py_DECREF(keyObject); + if (di == NULL) { - Py_DECREF(list); + Py_DECREF(iterator); + Py_DECREF(valObject); dict_unref(dict); PyErr_NoMemory(); return -1; @@ -4686,23 +4676,26 @@ pymap_to_tv(PyObject *obj, typval_T *tv, PyObject *lookup_dict) if (_ConvertFromPyObject(valObject, &di->di_tv, lookup_dict) == -1) { + Py_DECREF(iterator); + Py_DECREF(valObject); vim_free(di); dict_unref(dict); - Py_DECREF(list); return -1; } + Py_DECREF(valObject); + if (dict_add(dict, di) == FAIL) { + Py_DECREF(iterator); dictitem_free(di); dict_unref(dict); - Py_DECREF(list); PyErr_SetVim(_("failed to add key to dictionary")); return -1; } } + Py_DECREF(iterator); --dict->dv_refcount; - Py_DECREF(list); return 0; } @@ -4907,6 +4900,8 @@ _ConvertFromPyObject(PyObject *obj, typval_T *tv, PyObject *lookup_dict) tv->vval.v_float = (float_T) PyFloat_AsDouble(obj); } #endif + else if (PyObject_HasAttrString(obj, "keys")) + return convert_dl(obj, tv, pymap_to_tv, lookup_dict); else if (PyIter_Check(obj) || PySequence_Check(obj)) return convert_dl(obj, tv, pyseq_to_tv, lookup_dict); else if (PyMapping_Check(obj)) diff --git a/src/if_python.c b/src/if_python.c index 188e1a2c7..cf2ab9aa2 100644 --- a/src/if_python.c +++ b/src/if_python.c @@ -197,11 +197,12 @@ struct PyMethodDef { Py_ssize_t a; }; # define PyDict_GetItemString dll_PyDict_GetItemString # define PyDict_Next dll_PyDict_Next # define PyDict_Type (*dll_PyDict_Type) -# ifdef PyMapping_Items -# define PY_NO_MAPPING_ITEMS +# ifdef PyMapping_Keys +# define PY_NO_MAPPING_KEYS # else -# define PyMapping_Items dll_PyMapping_Items +# define PyMapping_Keys dll_PyMapping_Keys # endif +# define PyObject_GetItem dll_PyObject_GetItem # define PyObject_CallMethod dll_PyObject_CallMethod # define PyMapping_Check dll_PyMapping_Check # define PyIter_Next dll_PyIter_Next @@ -331,9 +332,10 @@ static PyObject*(*dll_PyDict_New)(void); static PyObject*(*dll_PyDict_GetItemString)(PyObject *, const char *); static int (*dll_PyDict_Next)(PyObject *, PyInt *, PyObject **, PyObject **); static PyTypeObject* dll_PyDict_Type; -# ifndef PY_NO_MAPPING_ITEMS -static PyObject* (*dll_PyMapping_Items)(PyObject *); +# ifndef PY_NO_MAPPING_KEYS +static PyObject* (*dll_PyMapping_Keys)(PyObject *); # endif +static PyObject* (*dll_PyObject_GetItem)(PyObject *, PyObject *); static PyObject* (*dll_PyObject_CallMethod)(PyObject *, char *, PyObject *); static int (*dll_PyMapping_Check)(PyObject *); static PyObject* (*dll_PyIter_Next)(PyObject *); @@ -494,9 +496,10 @@ static struct {"PyDict_Next", (PYTHON_PROC*)&dll_PyDict_Next}, {"PyDict_New", (PYTHON_PROC*)&dll_PyDict_New}, {"PyDict_Type", (PYTHON_PROC*)&dll_PyDict_Type}, -# ifndef PY_NO_MAPPING_ITEMS - {"PyMapping_Items", (PYTHON_PROC*)&dll_PyMapping_Items}, +# ifndef PY_NO_MAPPING_KEYS + {"PyMapping_Keys", (PYTHON_PROC*)&dll_PyMapping_Keys}, # endif + {"PyObject_GetItem", (PYTHON_PROC*)&dll_PyObject_GetItem}, {"PyObject_CallMethod", (PYTHON_PROC*)&dll_PyObject_CallMethod}, {"PyMapping_Check", (PYTHON_PROC*)&dll_PyMapping_Check}, {"PyIter_Next", (PYTHON_PROC*)&dll_PyIter_Next}, diff --git a/src/if_python3.c b/src/if_python3.c index 4f6809de9..66e153b6e 100644 --- a/src/if_python3.c +++ b/src/if_python3.c @@ -160,9 +160,10 @@ # define PyDict_GetItemString py3_PyDict_GetItemString # define PyDict_Next py3_PyDict_Next # define PyMapping_Check py3_PyMapping_Check -# define PyMapping_Items py3_PyMapping_Items +# define PyMapping_Keys py3_PyMapping_Keys # define PyIter_Next py3_PyIter_Next # define PyObject_GetIter py3_PyObject_GetIter +# define PyObject_GetItem py3_PyObject_GetItem # define PyObject_IsTrue py3_PyObject_IsTrue # define PyModule_GetDict py3_PyModule_GetDict #undef PyRun_SimpleString @@ -276,7 +277,7 @@ static PyObject* (*py3_PySequence_Fast)(PyObject *, const char *); static Py_ssize_t (*py3_PyTuple_Size)(PyObject *); static PyObject* (*py3_PyTuple_GetItem)(PyObject *, Py_ssize_t); static int (*py3_PyMapping_Check)(PyObject *); -static PyObject* (*py3_PyMapping_Items)(PyObject *); +static PyObject* (*py3_PyMapping_Keys)(PyObject *); static int (*py3_PySlice_GetIndicesEx)(PyObject *r, Py_ssize_t length, Py_ssize_t *start, Py_ssize_t *stop, Py_ssize_t *step, Py_ssize_t *slicelength); static PyObject* (*py3_PyErr_NoMemory)(void); @@ -304,6 +305,7 @@ static PyObject* (*py3_PyLong_FromLong)(long); static PyObject* (*py3_PyDict_New)(void); static PyObject* (*py3_PyIter_Next)(PyObject *); static PyObject* (*py3_PyObject_GetIter)(PyObject *); +static PyObject* (*py3_PyObject_GetItem)(PyObject *, PyObject *); static int (*py3_PyObject_IsTrue)(PyObject *); static PyObject* (*py3_Py_BuildValue)(char *, ...); static int (*py3_PyType_Ready)(PyTypeObject *type); @@ -456,9 +458,10 @@ static struct {"PyDict_GetItemString", (PYTHON_PROC*)&py3_PyDict_GetItemString}, {"PyDict_Next", (PYTHON_PROC*)&py3_PyDict_Next}, {"PyMapping_Check", (PYTHON_PROC*)&py3_PyMapping_Check}, - {"PyMapping_Items", (PYTHON_PROC*)&py3_PyMapping_Items}, + {"PyMapping_Keys", (PYTHON_PROC*)&py3_PyMapping_Keys}, {"PyIter_Next", (PYTHON_PROC*)&py3_PyIter_Next}, {"PyObject_GetIter", (PYTHON_PROC*)&py3_PyObject_GetIter}, + {"PyObject_GetItem", (PYTHON_PROC*)&py3_PyObject_GetItem}, {"PyObject_IsTrue", (PYTHON_PROC*)&py3_PyObject_IsTrue}, {"PyLong_FromLong", (PYTHON_PROC*)&py3_PyLong_FromLong}, {"PyDict_New", (PYTHON_PROC*)&py3_PyDict_New}, diff --git a/src/version.c b/src/version.c index d66214d13..76011808c 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1065, +/**/ 1064, /**/ 1063, |