To: vim_dev@googlegroups.com

Subject: Patch 7.3.1232

Fcc: outbox

From: Bram Moolenaar <Bram@moolenaar.net>

Mime-Version: 1.0

Content-Type: text/plain; charset=UTF-8

Content-Transfer-Encoding: 8bit

------------

Patch 7.3.1232

Problem:    Python: inconsistencies in variable names.

Solution:   Rename variables. (ZyX)

Files:	    src/eval.c, src/if_py_both.h

*** ../vim-7.3.1231/src/eval.c	2013-06-16 17:32:33.000000000 +0200

--- src/eval.c	2013-06-23 14:29:13.000000000 +0200

***************

*** 3228,3234 ****

      void	*fi_void;

      char_u	*arg;

  {

!     forinfo_T    *fi = (forinfo_T *)fi_void;

      int		result;

      listitem_T	*item;

--- 3228,3234 ----

      void	*fi_void;

      char_u	*arg;

  {

!     forinfo_T	*fi = (forinfo_T *)fi_void;

      int		result;

      listitem_T	*item;

*** ../vim-7.3.1231/src/if_py_both.h	2013-06-23 14:16:53.000000000 +0200

--- src/if_py_both.h	2013-06-23 14:29:13.000000000 +0200

***************

*** 107,134 ****

   * Use Py_XDECREF to decrement reference count.

   */

      static char_u *

! StringToChars(PyObject *object, PyObject **todecref)

  {

!     char_u	*p;

!     if (PyBytes_Check(object))

      {

! 	if (PyBytes_AsStringAndSize(object, (char **) &p, NULL) == -1

! 		|| p == NULL)

  	    return NULL;

  	*todecref = NULL;

      }

!     else if (PyUnicode_Check(object))

      {

  	PyObject	*bytes;

! 	if (!(bytes = PyUnicode_AsEncodedString(object, ENC_OPT, NULL)))

  	    return NULL;

! 	if(PyBytes_AsStringAndSize(bytes, (char **) &p, NULL) == -1

! 		|| p == NULL)

  	{

  	    Py_DECREF(bytes);

  	    return NULL;

--- 107,134 ----

   * Use Py_XDECREF to decrement reference count.

   */

      static char_u *

! StringToChars(PyObject *obj, PyObject **todecref)

  {

!     char_u	*str;

!     if (PyBytes_Check(obj))

      {

! 	if (PyBytes_AsStringAndSize(obj, (char **) &str, NULL) == -1

! 		|| str == NULL)

  	    return NULL;

  	*todecref = NULL;

      }

!     else if (PyUnicode_Check(obj))

      {

  	PyObject	*bytes;

! 	if (!(bytes = PyUnicode_AsEncodedString(obj, ENC_OPT, NULL)))

  	    return NULL;

! 	if(PyBytes_AsStringAndSize(bytes, (char **) &str, NULL) == -1

! 		|| str == NULL)

  	{

  	    Py_DECREF(bytes);

  	    return NULL;

***************

*** 144,154 ****

  #else

  		"expected bytes() or str() instance, but got %s"

  #endif

! 		, Py_TYPE_NAME(object));

  	return NULL;

      }

!     return (char_u *) p;

  }

  #define NUMBER_LONG     1

--- 144,154 ----

  #else

  		"expected bytes() or str() instance, but got %s"

  #endif

! 		, Py_TYPE_NAME(obj));

  	return NULL;

      }

!     return (char_u *) str;

  }

  #define NUMBER_LONG     1

***************

*** 263,297 ****

  {

      PyMethodDef	*method;

      char	**attr;

!     PyObject	*r;

!     if (!(r = PyList_New(0)))

  	return NULL;

      if (self)

  	for (method = self->ob_type->tp_methods ; method->ml_name != NULL ; ++method)

! 	    if (add_string(r, (char *) method->ml_name))

  	    {

! 		Py_DECREF(r);

  		return NULL;

  	    }

      for (attr = attributes ; *attr ; ++attr)

! 	if (add_string(r, *attr))

  	{

! 	    Py_DECREF(r);

  	    return NULL;

  	}

  #if PY_MAJOR_VERSION < 3

!     if (add_string(r, "__members__"))

      {

! 	Py_DECREF(r);

  	return NULL;

      }

  #endif

!     return r;

  }

  /* Output buffer management

--- 263,297 ----

  {

      PyMethodDef	*method;

      char	**attr;

!     PyObject	*ret;

!     if (!(ret = PyList_New(0)))

  	return NULL;

      if (self)

  	for (method = self->ob_type->tp_methods ; method->ml_name != NULL ; ++method)

! 	    if (add_string(ret, (char *) method->ml_name))

  	    {

! 		Py_DECREF(ret);

  		return NULL;

  	    }

      for (attr = attributes ; *attr ; ++attr)

! 	if (add_string(ret, *attr))

  	{

! 	    Py_DECREF(ret);

  	    return NULL;

  	}

  #if PY_MAJOR_VERSION < 3

!     if (add_string(ret, "__members__"))

      {

! 	Py_DECREF(ret);

  	return NULL;

      }

  #endif

!     return ret;

  }

  /* Output buffer management

***************

*** 321,329 ****

  }

      static int

! OutputSetattr(OutputObject *self, char *name, PyObject *val)

  {

!     if (val == NULL)

      {

  	PyErr_SET_STRING(PyExc_AttributeError,

  		"can't delete OutputObject attributes");

--- 321,329 ----

  }

      static int

! OutputSetattr(OutputObject *self, char *name, PyObject *valObject)

  {

!     if (valObject == NULL)

      {

  	PyErr_SET_STRING(PyExc_AttributeError,

  		"can't delete OutputObject attributes");

***************

*** 332,338 ****

      if (strcmp(name, "softspace") == 0)

      {

! 	if (NumberToLong(val, &(self->softspace), NUMBER_UNSIGNED))

  	    return -1;

  	return 0;

      }

--- 332,338 ----

      if (strcmp(name, "softspace") == 0)

      {

! 	if (NumberToLong(valObject, &(self->softspace), NUMBER_UNSIGNED))

  	    return -1;

  	return 0;

      }

***************

*** 518,527 ****

      static PyObject *

  LoaderLoadModule(LoaderObject *self, PyObject *args UNUSED)

  {

!     PyObject	*r = self->module;

!     Py_INCREF(r);

!     return r;

  }

  static struct PyMethodDef LoaderMethods[] = {

--- 518,527 ----

      static PyObject *

  LoaderLoadModule(LoaderObject *self, PyObject *args UNUSED)

  {

!     PyObject	*ret = self->module;

!     Py_INCREF(ret);

!     return ret;

  }

  static struct PyMethodDef LoaderMethods[] = {

***************

*** 579,585 ****

  VimCommand(PyObject *self UNUSED, PyObject *string)

  {

      char_u	*cmd;

!     PyObject	*result;

      PyObject	*todecref;

      if (!(cmd = StringToChars(string, &todecref)))

--- 579,585 ----

  VimCommand(PyObject *self UNUSED, PyObject *string)

  {

      char_u	*cmd;

!     PyObject	*ret;

      PyObject	*todecref;

      if (!(cmd = StringToChars(string, &todecref)))

***************

*** 596,608 ****

      Py_END_ALLOW_THREADS

      if (VimTryEnd())

! 	result = NULL;

      else

! 	result = Py_None;

!     Py_XINCREF(result);

      Py_XDECREF(todecref);

!     return result;

  }

  /*

--- 596,608 ----

      Py_END_ALLOW_THREADS

      if (VimTryEnd())

! 	ret = NULL;

      else

! 	ret = Py_None;

!     Py_XINCREF(ret);

      Py_XDECREF(todecref);

!     return ret;

  }

  /*

***************

*** 615,621 ****

      static PyObject *

  VimToPython(typval_T *our_tv, int depth, PyObject *lookup_dict)

  {

!     PyObject	*result;

      PyObject	*newObj;

      char	ptrBuf[sizeof(void *) * 2 + 3];

--- 615,621 ----

      static PyObject *

  VimToPython(typval_T *our_tv, int depth, PyObject *lookup_dict)

  {

!     PyObject	*ret;

      PyObject	*newObj;

      char	ptrBuf[sizeof(void *) * 2 + 3];

***************

*** 623,630 ****

      if (depth > 100)

      {

  	Py_INCREF(Py_None);

! 	result = Py_None;

! 	return result;

      }

      /* Check if we run into a recursive loop.  The item must be in lookup_dict

--- 623,630 ----

      if (depth > 100)

      {

  	Py_INCREF(Py_None);

! 	ret = Py_None;

! 	return ret;

      }

      /* Check if we run into a recursive loop.  The item must be in lookup_dict

***************

*** 636,650 ****

  		our_tv->v_type == VAR_LIST ? (void *)our_tv->vval.v_list

  					   : (void *)our_tv->vval.v_dict);

! 	if ((result = PyDict_GetItemString(lookup_dict, ptrBuf)))

  	{

! 	    Py_INCREF(result);

! 	    return result;

  	}

      }

      if (our_tv->v_type == VAR_STRING)

! 	result = PyString_FromString(our_tv->vval.v_string == NULL

  					? "" : (char *)our_tv->vval.v_string);

      else if (our_tv->v_type == VAR_NUMBER)

      {

--- 636,650 ----

  		our_tv->v_type == VAR_LIST ? (void *)our_tv->vval.v_list

  					   : (void *)our_tv->vval.v_dict);

! 	if ((ret = PyDict_GetItemString(lookup_dict, ptrBuf)))

  	{

! 	    Py_INCREF(ret);

! 	    return ret;

  	}

      }

      if (our_tv->v_type == VAR_STRING)

! 	ret = PyString_FromString(our_tv->vval.v_string == NULL

  					? "" : (char *)our_tv->vval.v_string);

      else if (our_tv->v_type == VAR_NUMBER)

      {

***************

*** 652,658 ****

  	/* For backwards compatibility numbers are stored as strings. */

  	sprintf(buf, "%ld", (long)our_tv->vval.v_number);

! 	result = PyString_FromString((char *) buf);

      }

  # ifdef FEAT_FLOAT

      else if (our_tv->v_type == VAR_FLOAT)

--- 652,658 ----

  	/* For backwards compatibility numbers are stored as strings. */

  	sprintf(buf, "%ld", (long)our_tv->vval.v_number);

! 	ret = PyString_FromString((char *) buf);

      }

  # ifdef FEAT_FLOAT

      else if (our_tv->v_type == VAR_FLOAT)

***************

*** 660,666 ****

  	char buf[NUMBUFLEN];

  	sprintf(buf, "%f", our_tv->vval.v_float);

! 	result = PyString_FromString((char *) buf);

      }

  # endif

      else if (our_tv->v_type == VAR_LIST)

--- 660,666 ----

  	char buf[NUMBUFLEN];

  	sprintf(buf, "%f", our_tv->vval.v_float);

! 	ret = PyString_FromString((char *) buf);

      }

  # endif

      else if (our_tv->v_type == VAR_LIST)

***************

*** 671,682 ****

  	if (list == NULL)

  	    return NULL;

! 	if (!(result = PyList_New(0)))

  	    return NULL;

! 	if (PyDict_SetItemString(lookup_dict, ptrBuf, result))

  	{

! 	    Py_DECREF(result);

  	    return NULL;

  	}

--- 671,682 ----

  	if (list == NULL)

  	    return NULL;

! 	if (!(ret = PyList_New(0)))

  	    return NULL;

! 	if (PyDict_SetItemString(lookup_dict, ptrBuf, ret))

  	{

! 	    Py_DECREF(ret);

  	    return NULL;

  	}

***************

*** 684,696 ****

  	{

  	    if (!(newObj = VimToPython(&curr->li_tv, depth + 1, lookup_dict)))

  	    {

! 		Py_DECREF(result);

  		return NULL;

  	    }

! 	    if (PyList_Append(result, newObj))

  	    {

  		Py_DECREF(newObj);

! 		Py_DECREF(result);

  		return NULL;

  	    }

  	    Py_DECREF(newObj);

--- 684,696 ----

  	{

  	    if (!(newObj = VimToPython(&curr->li_tv, depth + 1, lookup_dict)))

  	    {

! 		Py_DECREF(ret);

  		return NULL;

  	    }

! 	    if (PyList_Append(ret, newObj))

  	    {

  		Py_DECREF(newObj);

! 		Py_DECREF(ret);

  		return NULL;

  	    }

  	    Py_DECREF(newObj);

***************

*** 706,717 ****

  	if (our_tv->vval.v_dict == NULL)

  	    return NULL;

! 	if (!(result = PyDict_New()))

  	    return NULL;

! 	if (PyDict_SetItemString(lookup_dict, ptrBuf, result))

  	{

! 	    Py_DECREF(result);

  	    return NULL;

  	}

--- 706,717 ----

  	if (our_tv->vval.v_dict == NULL)

  	    return NULL;

! 	if (!(ret = PyDict_New()))

  	    return NULL;

! 	if (PyDict_SetItemString(lookup_dict, ptrBuf, ret))

  	{

! 	    Py_DECREF(ret);

  	    return NULL;

  	}

***************

*** 724,735 ****

  		di = dict_lookup(hi);

  		if (!(newObj = VimToPython(&di->di_tv, depth + 1, lookup_dict)))

  		{

! 		    Py_DECREF(result);

  		    return NULL;

  		}

! 		if (PyDict_SetItemString(result, (char *)hi->hi_key, newObj))

  		{

! 		    Py_DECREF(result);

  		    Py_DECREF(newObj);

  		    return NULL;

  		}

--- 724,735 ----

  		di = dict_lookup(hi);

  		if (!(newObj = VimToPython(&di->di_tv, depth + 1, lookup_dict)))

  		{

! 		    Py_DECREF(ret);

  		    return NULL;

  		}

! 		if (PyDict_SetItemString(ret, (char *)hi->hi_key, newObj))

  		{

! 		    Py_DECREF(ret);

  		    Py_DECREF(newObj);

  		    return NULL;

  		}

***************

*** 739,748 ****

      else

      {

  	Py_INCREF(Py_None);

! 	result = Py_None;

      }

!     return result;

  }

      static PyObject *

--- 739,748 ----

      else

      {

  	Py_INCREF(Py_None);

! 	ret = Py_None;

      }

!     return ret;

  }

      static PyObject *

***************

*** 752,758 ****

      typval_T	*our_tv;

      PyObject	*string;

      PyObject	*todecref;

!     PyObject	*result;

      PyObject	*lookup_dict;

      if (!PyArg_ParseTuple(args, "O", &string))

--- 752,758 ----

      typval_T	*our_tv;

      PyObject	*string;

      PyObject	*todecref;

!     PyObject	*ret;

      PyObject	*lookup_dict;

      if (!PyArg_ParseTuple(args, "O", &string))

***************

*** 782,791 ****

      /* Convert the Vim type into a Python type.  Create a dictionary that's

       * used to check for recursive loops. */

      if (!(lookup_dict = PyDict_New()))

! 	result = NULL;

      else

      {

! 	result = VimToPython(our_tv, 1, lookup_dict);

  	Py_DECREF(lookup_dict);

      }

--- 782,791 ----

      /* Convert the Vim type into a Python type.  Create a dictionary that's

       * used to check for recursive loops. */

      if (!(lookup_dict = PyDict_New()))

! 	ret = NULL;

      else

      {

! 	ret = VimToPython(our_tv, 1, lookup_dict);

  	Py_DECREF(lookup_dict);

      }

***************

*** 796,802 ****

      Python_Release_Vim();

      Py_END_ALLOW_THREADS

!     return result;

  }

  static PyObject *ConvertToPyObject(typval_T *);

--- 796,802 ----

      Python_Release_Vim();

      Py_END_ALLOW_THREADS

!     return ret;

  }

  static PyObject *ConvertToPyObject(typval_T *);

***************

*** 805,811 ****

  VimEvalPy(PyObject *self UNUSED, PyObject *string)

  {

      typval_T	*our_tv;

!     PyObject	*result;

      char_u	*expr;

      PyObject	*todecref;

--- 805,811 ----

  VimEvalPy(PyObject *self UNUSED, PyObject *string)

  {

      typval_T	*our_tv;

!     PyObject	*ret;

      char_u	*expr;

      PyObject	*todecref;

***************

*** 830,843 ****

  	return NULL;

      }

!     result = ConvertToPyObject(our_tv);

      Py_BEGIN_ALLOW_THREADS

      Python_Lock_Vim();

      free_tv(our_tv);

      Python_Release_Vim();

      Py_END_ALLOW_THREADS

!     return result;

  }

      static PyObject *

--- 830,843 ----

  	return NULL;

      }

!     ret = ConvertToPyObject(our_tv);

      Py_BEGIN_ALLOW_THREADS

      Python_Lock_Vim();

      free_tv(our_tv);

      Python_Release_Vim();

      Py_END_ALLOW_THREADS

!     return ret;

  }

      static PyObject *

***************

*** 845,888 ****

  {

      char_u	*str;

      PyObject	*todecref;

!     int		result;

      if (!(str = StringToChars(string, &todecref)))

  	return NULL;

  #ifdef FEAT_MBYTE

!     result = mb_string2cells(str, (int)STRLEN(str));

  #else

!     result = STRLEN(str);

  #endif

      Py_XDECREF(todecref);

!     return PyLong_FromLong(result);

  }

      static PyObject *

  _VimChdir(PyObject *_chdir, PyObject *args, PyObject *kwargs)

  {

!     PyObject	*r;

      PyObject	*newwd;

      PyObject	*todecref;

      char_u	*new_dir;

      if (_chdir == NULL)

  	return NULL;

!     if (!(r = PyObject_Call(_chdir, args, kwargs)))

  	return NULL;

      if (!(newwd = PyObject_CallFunctionObjArgs(py_getcwd, NULL)))

      {

! 	Py_DECREF(r);

  	return NULL;

      }

      if (!(new_dir = StringToChars(newwd, &todecref)))

      {

! 	Py_DECREF(r);

  	Py_DECREF(newwd);

  	return NULL;

      }

--- 845,888 ----

  {

      char_u	*str;

      PyObject	*todecref;

!     int		len;

      if (!(str = StringToChars(string, &todecref)))

  	return NULL;

  #ifdef FEAT_MBYTE

!     len = mb_string2cells(str, (int)STRLEN(str));

  #else

!     len = STRLEN(str);

  #endif

      Py_XDECREF(todecref);

!     return PyLong_FromLong(len);

  }

      static PyObject *

  _VimChdir(PyObject *_chdir, PyObject *args, PyObject *kwargs)

  {

!     PyObject	*ret;

      PyObject	*newwd;

      PyObject	*todecref;

      char_u	*new_dir;

      if (_chdir == NULL)

  	return NULL;

!     if (!(ret = PyObject_Call(_chdir, args, kwargs)))

  	return NULL;

      if (!(newwd = PyObject_CallFunctionObjArgs(py_getcwd, NULL)))

      {

! 	Py_DECREF(ret);

  	return NULL;

      }

      if (!(new_dir = StringToChars(newwd, &todecref)))

      {

! 	Py_DECREF(ret);

  	Py_DECREF(newwd);

  	return NULL;

      }

***************

*** 891,897 ****

      if (vim_chdir(new_dir))

      {

! 	Py_DECREF(r);

  	Py_DECREF(newwd);

  	Py_XDECREF(todecref);

--- 891,897 ----

      if (vim_chdir(new_dir))

      {

! 	Py_DECREF(ret);

  	Py_DECREF(newwd);

  	Py_XDECREF(todecref);

***************

*** 909,919 ****

      if (VimTryEnd())

      {

! 	Py_DECREF(r);

  	return NULL;

      }

!     return r;

  }

      static PyObject *

--- 909,919 ----

      if (VimTryEnd())

      {

! 	Py_DECREF(ret);

  	return NULL;

      }

!     return ret;

  }

      static PyObject *

***************

*** 1052,1071 ****

      static PyObject *

  Vim_GetPaths(PyObject *self UNUSED)

  {

!     PyObject	*r;

!     if (!(r = PyList_New(0)))

  	return NULL;

!     do_in_runtimepath(NULL, FALSE, &map_finder_callback, r);

      if (PyErr_Occurred())

      {

! 	Py_DECREF(r);

  	return NULL;

      }

!     return r;

  }

      static PyObject *

--- 1052,1071 ----

      static PyObject *

  Vim_GetPaths(PyObject *self UNUSED)

  {

!     PyObject	*ret;

!     if (!(ret = PyList_New(0)))

  	return NULL;

!     do_in_runtimepath(NULL, FALSE, &map_finder_callback, ret);

      if (PyErr_Occurred())

      {

! 	Py_DECREF(ret);

  	return NULL;

      }

!     return ret;

  }

      static PyObject *

***************

*** 1400,1415 ****

      static dict_T *

  py_dict_alloc(void)

  {

!     dict_T	*r;

!     if (!(r = dict_alloc()))

      {

  	PyErr_NoMemory();

  	return NULL;

      }

!     ++r->dv_refcount;

!     return r;

  }

      static PyObject *

--- 1400,1415 ----

      static dict_T *

  py_dict_alloc(void)

  {

!     dict_T	*ret;

!     if (!(ret = dict_alloc()))

      {

  	PyErr_NoMemory();

  	return NULL;

      }

!     ++ret->dv_refcount;

!     return ret;

  }

      static PyObject *

***************

*** 1461,1469 ****

  }

      static int

! DictionarySetattr(DictionaryObject *self, char *name, PyObject *val)

  {

!     if (val == NULL)

      {

  	PyErr_SET_STRING(PyExc_AttributeError,

  		"cannot delete vim.Dictionary attributes");

--- 1461,1469 ----

  }

      static int

! DictionarySetattr(DictionaryObject *self, char *name, PyObject *valObject)

  {

!     if (valObject == NULL)

      {

  	PyErr_SET_STRING(PyExc_AttributeError,

  		"cannot delete vim.Dictionary attributes");

***************

*** 1479,1485 ****

  	}

  	else

  	{

! 	    int		istrue = PyObject_IsTrue(val);