updated for version 7.3.1046
Problem: Python: Using Py_BuildValue for building strings.
Solution: Python patch 7 and 7.5: Replace Py_BuildValue with
PyString_FromString. (ZyX)
diff --git a/src/if_py_both.h b/src/if_py_both.h
index ad6e970..5b45742 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -442,7 +442,7 @@
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);
}
else if (our_tv->v_type == VAR_NUMBER)
@@ -451,7 +451,7 @@
/* For backwards compatibility numbers are stored as strings. */
sprintf(buf, "%ld", (long)our_tv->vval.v_number);
- result = Py_BuildValue("s", buf);
+ result = PyString_FromString((char *) buf);
}
# ifdef FEAT_FLOAT
else if (our_tv->v_type == VAR_FLOAT)
@@ -459,7 +459,7 @@
char buf[NUMBUFLEN];
sprintf(buf, "%f", our_tv->vval.v_float);
- result = Py_BuildValue("s", buf);
+ result = PyString_FromString((char *) buf);
}
# endif
else if (our_tv->v_type == VAR_LIST)
@@ -3256,7 +3256,8 @@
BufferAttr(BufferObject *self, char *name)
{
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)
return Py_BuildValue(Py_ssize_t_fmt, self->buf->b_fnum);
else if (strcmp(name, "vars") == 0)
diff --git a/src/version.c b/src/version.c
index 3afdf01..aefc166 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 1046,
+/**/
1045,
/**/
1044,