diff options
| author | Bram Moolenaar <Bram@vim.org> | 2013-04-24 13:47:45 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2013-04-24 13:47:45 +0200 |
| commit | 335e0b69744ededb907fb9167f72ac84e37e1304 (patch) | |
| tree | 32bfacea7b64cb829c456f1ad1eebe4efbee985c | |
| parent | 4d1da49cfe2528474dafb0535dd0cab19c3c3579 (diff) | |
| download | vim-git-335e0b69744ededb907fb9167f72ac84e37e1304.tar.gz | |
updated for version 7.3.910v7.3.910
Problem: Python code in #ifdef branches with only minor differences.
Solution: Merge the #ifdef branches. (ZyX)
| -rw-r--r-- | src/if_py_both.h | 40 | ||||
| -rw-r--r-- | src/if_python.c | 1 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 4 insertions, 39 deletions
diff --git a/src/if_py_both.h b/src/if_py_both.h index c24e86334..6e4f01af3 100644 --- a/src/if_py_both.h +++ b/src/if_py_both.h @@ -2853,7 +2853,6 @@ _ConvertFromPyObject(PyObject *obj, typval_T *tv, PyObject *lookupDict) tv->v_type = VAR_FUNC; func_ref(tv->vval.v_string); } -#if PY_MAJOR_VERSION >= 3 else if (PyBytes_Check(obj)) { char_u *result; @@ -2873,30 +2872,6 @@ _ConvertFromPyObject(PyObject *obj, typval_T *tv, PyObject *lookupDict) PyObject *bytes; char_u *result; - bytes = PyString_AsBytes(obj); - if (bytes == NULL) - return -1; - - if(PyString_AsStringAndSize(bytes, (char **) &result, NULL) == -1) - return -1; - if (result == NULL) - return -1; - - if (set_string_copy(result, tv) == -1) - { - Py_XDECREF(bytes); - return -1; - } - Py_XDECREF(bytes); - - tv->v_type = VAR_STRING; - } -#else - else if (PyUnicode_Check(obj)) - { - PyObject *bytes; - char_u *result; - bytes = PyUnicode_AsEncodedString(obj, (char *)ENC_OPT, NULL); if (bytes == NULL) return -1; @@ -2915,20 +2890,7 @@ _ConvertFromPyObject(PyObject *obj, typval_T *tv, PyObject *lookupDict) tv->v_type = VAR_STRING; } - else if (PyString_Check(obj)) - { - char_u *result; - - if(PyString_AsStringAndSize(obj, (char **) &result, NULL) == -1) - return -1; - if (result == NULL) - return -1; - - if (set_string_copy(result, tv) == -1) - return -1; - - tv->v_type = VAR_STRING; - } +#if PY_MAJOR_VERSION < 3 else if (PyInt_Check(obj)) { tv->v_type = VAR_NUMBER; diff --git a/src/if_python.c b/src/if_python.c index b13e73942..547df3acc 100644 --- a/src/if_python.c +++ b/src/if_python.c @@ -59,6 +59,7 @@ static void init_structs(void); #define PyBytes_FromString PyString_FromString +#define PyBytes_Check PyString_Check /* No-op conversion functions, use with care! */ #define PyString_AsBytes(obj) (obj) diff --git a/src/version.c b/src/version.c index 7a11a8fbc..95cd85756 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 */ /**/ + 910, +/**/ 909, /**/ 908, |