diff options
author | Bram Moolenaar <Bram@vim.org> | 2013-04-24 13:04:26 +0200 |
---|---|---|
committer | Bram Moolenaar <Bram@vim.org> | 2013-04-24 13:04:26 +0200 |
commit | af6abb9d93959d801d40a2d77a96962cef2335fc (patch) | |
tree | 2a4c39066970fd372b41b351535429df0f6e3b31 | |
parent | 3f99152276def2b8f88a3dd5f87f645e9e875da2 (diff) | |
download | vim-git-af6abb9d93959d801d40a2d77a96962cef2335fc.tar.gz |
updated for version 7.3.907v7.3.907
Problem: Python uses IndexError when a dict key is not found.
Solution: Use KeyError instead. (ZyX)
-rw-r--r-- | src/if_py_both.h | 2 | ||||
-rw-r--r-- | src/if_python.c | 4 | ||||
-rw-r--r-- | src/if_python3.c | 4 | ||||
-rw-r--r-- | src/testdir/test86.ok | 2 | ||||
-rw-r--r-- | src/testdir/test87.ok | 2 | ||||
-rw-r--r-- | src/version.c | 2 |
6 files changed, 13 insertions, 3 deletions
diff --git a/src/if_py_both.h b/src/if_py_both.h index f5617acfc..cd8080041 100644 --- a/src/if_py_both.h +++ b/src/if_py_both.h @@ -861,7 +861,7 @@ DictionaryItem(PyObject *self, PyObject *keyObject) if (di == NULL) { - PyErr_SetString(PyExc_IndexError, _("no such key in dictionary")); + PyErr_SetString(PyExc_KeyError, _("no such key in dictionary")); return NULL; } diff --git a/src/if_python.c b/src/if_python.c index 89cb0334b..0f90c9903 100644 --- a/src/if_python.c +++ b/src/if_python.c @@ -348,12 +348,14 @@ static HINSTANCE hinstPython = 0; /* Instance of python.dll */ /* Imported exception objects */ static PyObject *imp_PyExc_AttributeError; static PyObject *imp_PyExc_IndexError; +static PyObject *imp_PyExc_KeyError; static PyObject *imp_PyExc_KeyboardInterrupt; static PyObject *imp_PyExc_TypeError; static PyObject *imp_PyExc_ValueError; # define PyExc_AttributeError imp_PyExc_AttributeError # define PyExc_IndexError imp_PyExc_IndexError +# define PyExc_KeyError imp_PyExc_KeyError # define PyExc_KeyboardInterrupt imp_PyExc_KeyboardInterrupt # define PyExc_TypeError imp_PyExc_TypeError # define PyExc_ValueError imp_PyExc_ValueError @@ -579,11 +581,13 @@ get_exceptions(void) PyObject *exdict = PyModule_GetDict(exmod); imp_PyExc_AttributeError = PyDict_GetItemString(exdict, "AttributeError"); imp_PyExc_IndexError = PyDict_GetItemString(exdict, "IndexError"); + imp_PyExc_KeyError = PyDict_GetItemString(exdict, "KeyError"); imp_PyExc_KeyboardInterrupt = PyDict_GetItemString(exdict, "KeyboardInterrupt"); imp_PyExc_TypeError = PyDict_GetItemString(exdict, "TypeError"); imp_PyExc_ValueError = PyDict_GetItemString(exdict, "ValueError"); Py_XINCREF(imp_PyExc_AttributeError); Py_XINCREF(imp_PyExc_IndexError); + Py_XINCREF(imp_PyExc_KeyError); Py_XINCREF(imp_PyExc_KeyboardInterrupt); Py_XINCREF(imp_PyExc_TypeError); Py_XINCREF(imp_PyExc_ValueError); diff --git a/src/if_python3.c b/src/if_python3.c index d8f757475..2a66cfada 100644 --- a/src/if_python3.c +++ b/src/if_python3.c @@ -327,12 +327,14 @@ static HINSTANCE hinstPy3 = 0; /* Instance of python.dll */ /* Imported exception objects */ static PyObject *p3imp_PyExc_AttributeError; static PyObject *p3imp_PyExc_IndexError; +static PyObject *p3imp_PyExc_KeyError; static PyObject *p3imp_PyExc_KeyboardInterrupt; static PyObject *p3imp_PyExc_TypeError; static PyObject *p3imp_PyExc_ValueError; # define PyExc_AttributeError p3imp_PyExc_AttributeError # define PyExc_IndexError p3imp_PyExc_IndexError +# define PyExc_KeyError p3imp_PyExc_KeyError # define PyExc_KeyboardInterrupt p3imp_PyExc_KeyboardInterrupt # define PyExc_TypeError p3imp_PyExc_TypeError # define PyExc_ValueError p3imp_PyExc_ValueError @@ -567,11 +569,13 @@ get_py3_exceptions() PyObject *exdict = PyModule_GetDict(exmod); p3imp_PyExc_AttributeError = PyDict_GetItemString(exdict, "AttributeError"); p3imp_PyExc_IndexError = PyDict_GetItemString(exdict, "IndexError"); + p3imp_PyExc_KeyError = PyDict_GetItemString(exdict, "KeyError"); p3imp_PyExc_KeyboardInterrupt = PyDict_GetItemString(exdict, "KeyboardInterrupt"); p3imp_PyExc_TypeError = PyDict_GetItemString(exdict, "TypeError"); p3imp_PyExc_ValueError = PyDict_GetItemString(exdict, "ValueError"); Py_XINCREF(p3imp_PyExc_AttributeError); Py_XINCREF(p3imp_PyExc_IndexError); + Py_XINCREF(p3imp_PyExc_KeyError); Py_XINCREF(p3imp_PyExc_KeyboardInterrupt); Py_XINCREF(p3imp_PyExc_TypeError); Py_XINCREF(p3imp_PyExc_ValueError); diff --git a/src/testdir/test86.ok b/src/testdir/test86.ok index fd670c846..20b00d4d0 100644 --- a/src/testdir/test86.ok +++ b/src/testdir/test86.ok @@ -38,7 +38,7 @@ Vim(put):E684: Vim(python):E725: Vim(python):E117: [0.0, 0.0] -IndexError +KeyError TypeError TypeError ValueError diff --git a/src/testdir/test87.ok b/src/testdir/test87.ok index b8769002a..9d75c564e 100644 --- a/src/testdir/test87.ok +++ b/src/testdir/test87.ok @@ -38,7 +38,7 @@ Vim(put):E684: Vim(py3):E725: Vim(py3):E117: [0.0, 0.0] -IndexError +KeyError TypeError TypeError ValueError diff --git a/src/version.c b/src/version.c index a28cf6c31..1aeeb5621 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 */ /**/ + 907, +/**/ 906, /**/ 905, |