Mercurial > vim
changeset 4603:074491a83571 v7.3.1049
updated for version 7.3.1049
Problem: Python: no consistent naming
Solution: Python patch 10: Rename DICTKEY_GET_NOTEMPTY to DICTKEY_GET. (ZyX)
| author | Bram Moolenaar <bram@vim.org> |
|---|---|
| date | Wed, 29 May 2013 22:43:37 +0200 |
| parents | e4d01be7bec0 |
| children | a70df97b59ff |
| files | src/if_py_both.h src/version.c |
| diffstat | 2 files changed, 14 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/src/if_py_both.h +++ b/src/if_py_both.h @@ -34,7 +34,12 @@ typedef int Py_ssize_t; /* Python 2.4 a PyObject *dictkey_todecref; #define DICTKEY_GET(err) \ if (!(key = StringToChars(keyObject, &dictkey_todecref))) \ - return err; + return err; \ + if (*key == NUL) \ + { \ + PyErr_SetString(PyExc_ValueError, _("empty keys are not allowed")); \ + return err; \ + } #define DICTKEY_UNREF \ Py_XDECREF(dictkey_todecref); @@ -851,14 +856,6 @@ pyll_add(PyObject *self, pylinkedlist_T static PyTypeObject DictionaryType; -#define DICTKEY_GET_NOTEMPTY(err) \ - DICTKEY_GET(err) \ - if (*key == NUL) \ - { \ - PyErr_SetString(PyExc_ValueError, _("empty keys are not allowed")); \ - return err; \ - } - typedef struct { PyObject_HEAD @@ -950,7 +947,7 @@ DictionaryItem(DictionaryObject *self, P dictitem_T *di; DICTKEY_DECL - DICTKEY_GET_NOTEMPTY(NULL) + DICTKEY_GET(NULL) di = dict_find(self->dict, key, -1); @@ -980,7 +977,7 @@ DictionaryAssItem(DictionaryObject *self return -1; } - DICTKEY_GET_NOTEMPTY(-1) + DICTKEY_GET(-1) di = dict_find(dict, key, -1); @@ -1653,7 +1650,7 @@ OptionsItem(OptionsObject *self, PyObjec if (self->Check(self->from)) return NULL; - DICTKEY_GET_NOTEMPTY(NULL) + DICTKEY_GET(NULL) flags = get_option_value_strict(key, &numval, &stringval, self->opt_type, self->from); @@ -1792,7 +1789,7 @@ OptionsAssItem(OptionsObject *self, PyOb if (self->Check(self->from)) return -1; - DICTKEY_GET_NOTEMPTY(-1) + DICTKEY_GET(-1) flags = get_option_value_strict(key, NULL, NULL, self->opt_type, self->from); @@ -4037,7 +4034,7 @@ pydict_to_tv(PyObject *obj, typval_T *tv if (valObject == NULL) return -1; - DICTKEY_GET_NOTEMPTY(-1) + DICTKEY_GET(-1) di = dictitem_alloc(key); @@ -4111,7 +4108,7 @@ pymap_to_tv(PyObject *obj, typval_T *tv, return -1; } - DICTKEY_GET_NOTEMPTY(-1) + DICTKEY_GET(-1) valObject = PyTuple_GetItem(litem, 1); if (valObject == NULL)