updated for version 7.3.994
Problem: Python: using magic constants.
Solution: Use descriptive values for ml_flags. (ZyX)
diff --git a/src/if_py_both.h b/src/if_py_both.h
index c5be7c5..e60c35d 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -220,7 +220,7 @@
}
static PyObject *
-OutputFlush(PyObject *self UNUSED, PyObject *args UNUSED)
+OutputFlush(PyObject *self UNUSED)
{
/* do nothing */
Py_INCREF(Py_None);
@@ -230,11 +230,11 @@
/***************/
static struct PyMethodDef OutputMethods[] = {
- /* name, function, calling, doc */
- {"write", (PyCFunction)OutputWrite, 1, ""},
- {"writelines", (PyCFunction)OutputWritelines, 1, ""},
- {"flush", (PyCFunction)OutputFlush, 1, ""},
- { NULL, NULL, 0, NULL}
+ /* name, function, calling, doc */
+ {"write", (PyCFunction)OutputWrite, METH_VARARGS, ""},
+ {"writelines", (PyCFunction)OutputWritelines, METH_VARARGS, ""},
+ {"flush", (PyCFunction)OutputFlush, METH_NOARGS, ""},
+ { NULL, NULL, 0, NULL}
};
static OutputObject Output =
@@ -533,12 +533,12 @@
*/
static struct PyMethodDef VimMethods[] = {
- /* name, function, calling, documentation */
- {"command", VimCommand, 1, "Execute a Vim ex-mode command" },
- {"eval", VimEval, 1, "Evaluate an expression using Vim evaluator" },
- {"bindeval", VimEvalPy, 1, "Like eval(), but returns objects attached to vim ones"},
- {"strwidth", VimStrwidth, 1, "Screen string width, counts <Tab> as having width 1"},
- { NULL, NULL, 0, NULL }
+ /* name, function, calling, documentation */
+ {"command", VimCommand, METH_VARARGS, "Execute a Vim ex-mode command" },
+ {"eval", VimEval, METH_VARARGS, "Evaluate an expression using Vim evaluator" },
+ {"bindeval", VimEvalPy, METH_VARARGS, "Like eval(), but returns objects attached to vim ones"},
+ {"strwidth", VimStrwidth, METH_VARARGS, "Screen string width, counts <Tab> as having width 1"},
+ { NULL, NULL, 0, NULL }
};
/*
@@ -868,8 +868,8 @@
};
static struct PyMethodDef DictionaryMethods[] = {
- {"keys", (PyCFunction)DictionaryListKeys, METH_NOARGS, ""},
- { NULL, NULL, 0, NULL }
+ {"keys", (PyCFunction)DictionaryListKeys, METH_NOARGS, ""},
+ { NULL, NULL, 0, NULL }
};
static PyTypeObject ListType;
@@ -1248,8 +1248,8 @@
}
static struct PyMethodDef ListMethods[] = {
- {"extend", (PyCFunction)ListConcatInPlace, METH_O, ""},
- { NULL, NULL, 0, NULL }
+ {"extend", (PyCFunction)ListConcatInPlace, METH_O, ""},
+ { NULL, NULL, 0, NULL }
};
typedef struct
@@ -1349,8 +1349,8 @@
}
static struct PyMethodDef FunctionMethods[] = {
- {"__call__", (PyCFunction)FunctionCall, METH_VARARGS|METH_KEYWORDS, ""},
- { NULL, NULL, 0, NULL }
+ {"__call__", (PyCFunction)FunctionCall, METH_VARARGS|METH_KEYWORDS, ""},
+ { NULL, NULL, 0, NULL}
};
/*
@@ -2960,9 +2960,9 @@
}
static struct PyMethodDef RangeMethods[] = {
- /* name, function, calling, documentation */
- {"append", (PyCFunction)RangeAppend, 1, "Append data to the Vim range" },
- { NULL, NULL, 0, NULL }
+ /* name, function, calling, documentation */
+ {"append", (PyCFunction)RangeAppend, METH_VARARGS, "Append data to the Vim range" },
+ { NULL, NULL, 0, NULL }
};
static PyTypeObject BufferType;
@@ -3146,14 +3146,14 @@
}
static struct PyMethodDef BufferMethods[] = {
- /* name, function, calling, documentation */
- {"append", (PyCFunction)BufferAppend, 1, "Append data to Vim buffer" },
- {"mark", (PyCFunction)BufferMark, 1, "Return (row,col) representing position of named mark" },
- {"range", (PyCFunction)BufferRange, 1, "Return a range object which represents the part of the given buffer between line numbers s and e" },
+ /* name, function, calling, documentation */
+ {"append", (PyCFunction)BufferAppend, METH_VARARGS, "Append data to Vim buffer" },
+ {"mark", (PyCFunction)BufferMark, METH_VARARGS, "Return (row,col) representing position of named mark" },
+ {"range", (PyCFunction)BufferRange, METH_VARARGS, "Return a range object which represents the part of the given buffer between line numbers s and e" },
#if PY_VERSION_HEX >= 0x03000000
- {"__dir__", (PyCFunction)BufferDir, 4, "List its attributes" },
+ {"__dir__", (PyCFunction)BufferDir, METH_NOARGS, "List buffer attributes" },
#endif
- { NULL, NULL, 0, NULL }
+ { NULL, NULL, 0, NULL }
};
/*
diff --git a/src/if_python3.c b/src/if_python3.c
index 6a6ed7b..0620e03 100644
--- a/src/if_python3.c
+++ b/src/if_python3.c
@@ -666,7 +666,7 @@
return PyType_GenericAlloc(type,nitems);
}
-static PyObject *BufferDir(PyObject *, PyObject *);
+static PyObject *BufferDir(PyObject *);
static PyObject *OutputGetattro(PyObject *, PyObject *);
static int OutputSetattro(PyObject *, PyObject *, PyObject *);
static PyObject *BufferGetattro(PyObject *, PyObject *);
@@ -1091,7 +1091,7 @@
}
static PyObject *
-BufferDir(PyObject *self UNUSED, PyObject *args UNUSED)
+BufferDir(PyObject *self UNUSED)
{
return Py_BuildValue("[sssss]", "name", "number",
"append", "mark", "range");
diff --git a/src/version.c b/src/version.c
index 5996ad7..32d3eca 100644
--- a/src/version.c
+++ b/src/version.c
@@ -729,6 +729,8 @@
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 994,
+/**/
993,
/**/
992,