summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2012-07-25 15:36:04 +0200
committerBram Moolenaar <Bram@vim.org>2012-07-25 15:36:04 +0200
commit9581b5f70ea311bba35c537f0111a15bc96249c3 (patch)
treefebeed7fa7e980c45d48aad5396e8f261a51b990 /src
parent641e28615398a960b810ec53a50398a63a3d2f68 (diff)
downloadvim-git-9581b5f70ea311bba35c537f0111a15bc96249c3.tar.gz
updated for version 7.3.611v7.3.611
Problem: Can't use Vim dictionary as self argument in Python. Solution: Fix the check for the "self" argument. (ZyX)
Diffstat (limited to 'src')
-rw-r--r--src/if_py_both.h5
-rw-r--r--src/version.c2
2 files changed, 5 insertions, 2 deletions
diff --git a/src/if_py_both.h b/src/if_py_both.h
index 530c6d86a..6c1aa7fd4 100644
--- a/src/if_py_both.h
+++ b/src/if_py_both.h
@@ -1284,9 +1284,10 @@ FunctionCall(PyObject *self, PyObject *argsObject, PyObject *kwargs)
selfdictObject = PyDict_GetItemString(kwargs, "self");
if (selfdictObject != NULL)
{
- if (!PyDict_Check(selfdictObject))
+ if (!PyMapping_Check(selfdictObject))
{
- PyErr_SetString(PyExc_TypeError, _("'self' argument must be a dictionary"));
+ PyErr_SetString(PyExc_TypeError,
+ _("'self' argument must be a dictionary"));
clear_tv(&args);
return NULL;
}
diff --git a/src/version.c b/src/version.c
index 9ce83e767..ed205bbc3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -715,6 +715,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 611,
+/**/
610,
/**/
609,