From: Bram Moolenaar <Bram@vim.org>
Date: Wed, 25 Jul 2012 13:36:04 +0000 (+0200)
Subject: updated for version 7.3.611
X-Git-Tag: v7.3.611
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9581b5f70ea311bba35c537f0111a15bc96249c3;p=vim

updated for version 7.3.611
Problem:    Can't use Vim dictionary as self argument in Python.
Solution:   Fix the check for the "self" argument. (ZyX)
---

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
@@ -714,6 +714,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    611,
 /**/
     610,
 /**/