aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-09-25 03:54:15 -04:00
Code Activity

updated for version 7.3.1046

Browse Source 
Problem:    Python: Using Py_BuildValue for building strings.
Solution:   Python patch 7 and 7.5: Replace Py_BuildValue with
            PyString_FromString. (ZyX)
This commit is contained in:
Bram Moolenaar
2013-05-29 22:26:18 +02:00
parent 21642ed1b4
commit 432b09c84d
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/if_py_both.h
View File

@@ -442,7 +442,7 @@ VimToPython(typval_T *our_tv, int depth, PyObject *lookupDict)
if (our_tv->v_type == VAR_STRING) if (our_tv->v_type == VAR_STRING)
{ {
result = Py_BuildValue("s", our_tv->vval.v_string == NULL result = PyString_FromString(our_tv->vval.v_string == NULL
? "" : (char *)our_tv->vval.v_string); ? "" : (char *)our_tv->vval.v_string);
} }
else if (our_tv->v_type == VAR_NUMBER) else if (our_tv->v_type == VAR_NUMBER)
@@ -451,7 +451,7 @@ VimToPython(typval_T *our_tv, int depth, PyObject *lookupDict)
/* For backwards compatibility numbers are stored as strings. */ /* For backwards compatibility numbers are stored as strings. */
sprintf(buf, "%ld", (long)our_tv->vval.v_number); sprintf(buf, "%ld", (long)our_tv->vval.v_number);
result = Py_BuildValue("s", buf); result = PyString_FromString((char *) buf);
} }
# ifdef FEAT_FLOAT # ifdef FEAT_FLOAT
else if (our_tv->v_type == VAR_FLOAT) else if (our_tv->v_type == VAR_FLOAT)
@@ -459,7 +459,7 @@ VimToPython(typval_T *our_tv, int depth, PyObject *lookupDict)
char buf[NUMBUFLEN]; char buf[NUMBUFLEN];
sprintf(buf, "%f", our_tv->vval.v_float); sprintf(buf, "%f", our_tv->vval.v_float);
result = Py_BuildValue("s", buf); result = PyString_FromString((char *) buf);
} }
# endif # endif
else if (our_tv->v_type == VAR_LIST) else if (our_tv->v_type == VAR_LIST)
@@ -3256,7 +3256,8 @@ BufferAttrValid(BufferObject *self, char *name)
BufferAttr(BufferObject *self, char *name) BufferAttr(BufferObject *self, char *name)
{ {
if (strcmp(name, "name") == 0) if (strcmp(name, "name") == 0)
return Py_BuildValue("s", self->buf->b_ffname); return PyString_FromString((self->buf->b_ffname == NULL
? "" : (char *) self->buf->b_ffname));
else if (strcmp(name, "number") == 0) else if (strcmp(name, "number") == 0)
return Py_BuildValue(Py_ssize_t_fmt, self->buf->b_fnum); return Py_BuildValue(Py_ssize_t_fmt, self->buf->b_fnum);
else if (strcmp(name, "vars") == 0) else if (strcmp(name, "vars") == 0)

2
src/version.c
View File

@@ -728,6 +728,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1046,
/**/ /**/
1045, 1045,
/**/ /**/