To: vim_dev@googlegroups.com

Subject: Patch 7.3.1230

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.1230

Problem:    Python: Exception messages are not clear.

Solution:   Make exception messages more verbose. (ZyX)

Files:	    src/if_py_both.h, src/if_python3.c, src/if_python.c,

	    src/testdir/test86.ok, src/testdir/test87.ok

*** ../vim-7.3.1229/src/if_py_both.h	2013-06-23 13:28:11.000000000 +0200

--- src/if_py_both.h	2013-06-23 13:31:16.000000000 +0200

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

*** 29,37 ****

--- 29,53 ----

  #define PyErr_SET_STRING(exc, str) PyErr_SetString(exc, _(str))

  #define PyErr_SetVim(str) PyErr_SetString(VimError, str)

  #define PyErr_SET_VIM(str) PyErr_SET_STRING(VimError, str)

+ #define PyErr_FORMAT(exc, str, tail) PyErr_Format(exc, _(str), tail)

+ #define PyErr_VIM_FORMAT(str, tail) PyErr_FORMAT(VimError, str, tail)

+ 

+ #define Py_TYPE_NAME(obj) (obj->ob_type->tp_name == NULL \

+ 	? "(NULL)" \

+ 	: obj->ob_type->tp_name)

  #define RAISE_NO_EMPTY_KEYS PyErr_SET_STRING(PyExc_ValueError, \

  						"empty keys are not allowed")

+ #define RAISE_LOCKED(type) PyErr_SET_VIM(_(type " is locked"))

+ #define RAISE_LOCKED_DICTIONARY RAISE_LOCKED("dictionary")

+ #define RAISE_LOCKED_LIST RAISE_LOCKED("list")

+ #define RAISE_UNDO_FAIL PyErr_SET_VIM("cannot save undo information")

+ #define RAISE_LINE_FAIL(act) PyErr_SET_VIM("cannot " act " line")

+ #define RAISE_KEY_ADD_FAIL(key) \

+     PyErr_VIM_FORMAT("failed to add key '%s' to dictionary", key)

+ #define RAISE_INVALID_INDEX_TYPE(idx) \

+     PyErr_FORMAT(PyExc_TypeError, "index must be int or slice, not %s", \

+ 	    Py_TYPE_NAME(idx));

  #define INVALID_BUFFER_VALUE ((buf_T *)(-1))

  #define INVALID_WINDOW_VALUE ((win_T *)(-1))

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

*** 122,128 ****

      }

      else

      {

! 	PyErr_SET_STRING(PyExc_TypeError, "object must be string");

  	return NULL;

      }

--- 138,150 ----

      }

      else

      {

! 	PyErr_FORMAT(PyExc_TypeError,

! #if PY_MAJOR_VERSION < 3

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

! #else

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

! #endif

! 		, Py_TYPE_NAME(object));

  	return NULL;

      }

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

*** 231,237 ****

  	return 0;

      }

!     PyErr_SET_STRING(PyExc_AttributeError, "invalid attribute");

      return -1;

  }

--- 253,259 ----

  	return 0;

      }

!     PyErr_FORMAT(PyExc_AttributeError, "invalid attribute: %s", name);

      return -1;

  }

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

*** 967,977 ****

  {

      PyObject	*fd, *pathname, *description;

!     if (!PyTuple_Check(find_module_result)

! 	    || PyTuple_GET_SIZE(find_module_result) != 3)

      {

! 	PyErr_SET_STRING(PyExc_TypeError,

! 		"expected 3-tuple as imp.find_module() result");

  	return NULL;

      }

--- 989,1007 ----

  {

      PyObject	*fd, *pathname, *description;

!     if (!PyTuple_Check(find_module_result))

      {

! 	PyErr_FORMAT(PyExc_TypeError,

! 		"expected 3-tuple as imp.find_module() result, but got %s",

! 		Py_TYPE_NAME(find_module_result));

! 	return NULL;

!     }

!     if (PyTuple_GET_SIZE(find_module_result) != 3)

!     {

! 	PyErr_FORMAT(PyExc_TypeError,

! 		"expected 3-tuple as imp.find_module() result, but got "

! 		"tuple of size %d",

! 		(int) PyTuple_GET_SIZE(find_module_result));

  	return NULL;

      }

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

*** 1377,1383 ****

      }

      else

      {

! 	PyErr_SET_STRING(PyExc_AttributeError, "cannot set this attribute");

  	return -1;

      }

  }

--- 1407,1413 ----

      }

      else

      {

! 	PyErr_FORMAT(PyExc_AttributeError, "cannot set attribute %s", name);

  	return -1;

      }

  }

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

*** 1459,1465 ****

      {

  	if (dict->dv_lock)

  	{

! 	    PyErr_SET_VIM("dict is locked");

  	    Py_DECREF(r);

  	    return NULL;

  	}

--- 1489,1495 ----

      {

  	if (dict->dv_lock)

  	{

! 	    RAISE_LOCKED_DICTIONARY;

  	    Py_DECREF(r);

  	    return NULL;

  	}

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

*** 1562,1568 ****

      if (dict->dv_lock)

      {

! 	PyErr_SET_VIM("dict is locked");

  	return -1;

      }

--- 1592,1598 ----

      if (dict->dv_lock)

      {

! 	RAISE_LOCKED_DICTIONARY;

  	return -1;

      }

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

*** 1614,1623 ****

  	if (dict_add(dict, di) == FAIL)

  	{

- 	    Py_XDECREF(todecref);

  	    vim_free(di);

  	    dictitem_free(di);

! 	    PyErr_SET_VIM("failed to add key to dictionary");

  	    return -1;

  	}

      }

--- 1644,1653 ----

  	if (dict_add(dict, di) == FAIL)

  	{

  	    vim_free(di);

  	    dictitem_free(di);

! 	    RAISE_KEY_ADD_FAIL(key);

! 	    Py_XDECREF(todecref);

  	    return -1;

  	}

      }

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

*** 1725,1731 ****

      if (dict->dv_lock)

      {

! 	PyErr_SET_VIM("dict is locked");

  	return NULL;

      }

--- 1755,1761 ----

      if (dict->dv_lock)

      {

! 	RAISE_LOCKED_DICTIONARY;

  	return NULL;

      }

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

*** 1781,1788 ****

  		{

  		    Py_DECREF(iterator);

  		    Py_DECREF(fast);

! 		    PyErr_SET_STRING(PyExc_ValueError,

! 			    "expected sequence element of size 2");

  		    return NULL;

  		}

--- 1811,1820 ----

  		{

  		    Py_DECREF(iterator);

  		    Py_DECREF(fast);

! 		    PyErr_FORMAT(PyExc_ValueError,

! 			    "expected sequence element of size 2, "

! 			    "but got sequence of size %d",

! 			    PySequence_Fast_GET_SIZE(fast));

  		    return NULL;

  		}

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

*** 1823,1831 ****

  		if (dict_add(dict, di) == FAIL)

  		{

  		    Py_DECREF(iterator);

  		    dictitem_free(di);

- 		    PyErr_SET_VIM("failed to add key to dictionary");

  		    return NULL;

  		}

  	    }

--- 1855,1863 ----

  		if (dict_add(dict, di) == FAIL)

  		{

+ 		    RAISE_KEY_ADD_FAIL(di->di_key);

  		    Py_DECREF(iterator);

  		    dictitem_free(di);

  		    return NULL;

  		}

  	    }

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

*** 2085,2091 ****

      li = list_find(self->list, (long) index);

      if (li == NULL)

      {

! 	PyErr_SET_VIM("internal error: failed to get vim list item");

  	return NULL;

      }

      return ConvertToPyObject(&li->li_tv);

--- 2117,2125 ----

      li = list_find(self->list, (long) index);

      if (li == NULL)

      {

! 	/* No more suitable format specifications in python-2.3 */

! 	PyErr_VIM_FORMAT("internal error: failed to get vim list item %d",

! 		(int) index);

  	return NULL;

      }

      return ConvertToPyObject(&li->li_tv);

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

*** 2198,2204 ****

      if (l->lv_lock)

      {

! 	PyErr_SET_VIM("list is locked");

  	return -1;

      }

      if (index>length || (index==length && obj==NULL))

--- 2232,2238 ----

      if (l->lv_lock)

      {

! 	RAISE_LOCKED_LIST;

  	return -1;

      }

      if (index>length || (index==length && obj==NULL))

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

*** 2252,2258 ****

      if (l->lv_lock)

      {

! 	PyErr_SET_VIM("list is locked");

  	return -1;

      }

--- 2286,2292 ----

      if (l->lv_lock)

      {

! 	RAISE_LOCKED_LIST;

  	return -1;

      }

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

*** 2265,2271 ****

  	li = list_find(l, (long) first);

  	if (li == NULL)

  	{

! 	    PyErr_SET_VIM("internal error: no vim list item");

  	    return -1;

  	}

  	if (last > first)

--- 2299,2305 ----

  	li = list_find(l, (long) first);

  	if (li == NULL)

  	{

! 	    PyErr_VIM_FORMAT("internal error: no vim list item %d", (int)first);

  	    return -1;

  	}

  	if (last > first)

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

*** 2315,2321 ****

      if (l->lv_lock)

      {

! 	PyErr_SET_VIM("list is locked");

  	return NULL;

      }

--- 2349,2355 ----

      if (l->lv_lock)

      {

! 	RAISE_LOCKED_LIST;

  	return NULL;

      }

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

*** 2375,2381 ****

      }

      else

      {

! 	PyErr_SET_STRING(PyExc_AttributeError, "cannot set this attribute");

  	return -1;

      }

  }

--- 2409,2415 ----

      }

      else

      {

! 	PyErr_FORMAT(PyExc_AttributeError, "cannot set attribute %s", name);

  	return -1;

      }

  }

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

*** 2410,2417 ****

      {

  	if (!translated_function_exists(name))

  	{

! 	    PyErr_SET_STRING(PyExc_ValueError,

! 		    "unnamed function does not exist");

  	    return NULL;

  	}

  	self->name = vim_strsave(name);

--- 2444,2451 ----

      {

  	if (!translated_function_exists(name))

  	{

! 	    PyErr_FORMAT(PyExc_ValueError,

! 		    "unnamed function %s does not exist", name);

  	    return NULL;

  	}

  	self->name = vim_strsave(name);

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

*** 2422,2428 ****

  				    vim_strchr(name, AUTOLOAD_CHAR) == NULL))

  		== NULL)

  	{

! 	    PyErr_SET_STRING(PyExc_ValueError, "function does not exist");

  	    return NULL;

  	}

--- 2456,2462 ----

  				    vim_strchr(name, AUTOLOAD_CHAR) == NULL))

  		== NULL)

  	{

! 	    PyErr_FORMAT(PyExc_ValueError, "function %s does not exist", name);

  	    return NULL;

  	}

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

*** 2515,2521 ****

      else if (error != OK)

      {

  	result = NULL;

! 	PyErr_SET_VIM("failed to run function");

      }

      else

  	result = ConvertToPyObject(&rettv);

--- 2549,2555 ----

      else if (error != OK)

      {

  	result = NULL;

! 	PyErr_VIM_FORMAT("failed to run function %s", (char *)name);

      }

      else

  	result = ConvertToPyObject(&rettv);

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

*** 2770,2783 ****

      {

  	if (self->opt_type == SREQ_GLOBAL)

  	{

! 	    PyErr_SET_STRING(PyExc_ValueError, "unable to unset global option");

  	    Py_XDECREF(todecref);

  	    return -1;

  	}

  	else if (!(flags & SOPT_GLOBAL))

  	{

! 	    PyErr_SET_STRING(PyExc_ValueError, "unable to unset option "

! 					       "without global value");

  	    Py_XDECREF(todecref);

  	    return -1;

  	}

--- 2804,2819 ----

      {

  	if (self->opt_type == SREQ_GLOBAL)

  	{

! 	    PyErr_FORMAT(PyExc_ValueError,

! 		    "unable to unset global option %s", key);

  	    Py_XDECREF(todecref);

  	    return -1;

  	}

  	else if (!(flags & SOPT_GLOBAL))

  	{

! 	    PyErr_FORMAT(PyExc_ValueError,

! 		    "unable to unset option %s "

! 		    "which does not have global value", key);

  	    Py_XDECREF(todecref);

  	    return -1;

  	}

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

*** 3195,3201 ****

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

      {

! 	PyErr_SET_STRING(PyExc_TypeError, "readonly attribute");

  	return -1;

      }

      else if (strcmp(name, "cursor") == 0)

--- 3231,3237 ----

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

      {

! 	PyErr_SET_STRING(PyExc_TypeError, "readonly attribute: buffer");

  	return -1;

      }

      else if (strcmp(name, "cursor") == 0)

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

*** 3558,3566 ****

  	VimTryStart();

  	if (u_savedel((linenr_T)n, 1L) == FAIL)

! 	    PyErr_SET_VIM("cannot save undo information");

  	else if (ml_delete((linenr_T)n, FALSE) == FAIL)

! 	    PyErr_SET_VIM("cannot delete line");

  	else

  	{

  	    if (buf == savebuf)

--- 3594,3602 ----

  	VimTryStart();

  	if (u_savedel((linenr_T)n, 1L) == FAIL)

! 	    RAISE_UNDO_FAIL;

  	else if (ml_delete((linenr_T)n, FALSE) == FAIL)

! 	    RAISE_LINE_FAIL("delete");

  	else

  	{

  	    if (buf == savebuf)

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

*** 3594,3605 ****

  	if (u_savesub((linenr_T)n) == FAIL)

  	{

! 	    PyErr_SET_VIM("cannot save undo information");

  	    vim_free(save);

  	}

  	else if (ml_replace((linenr_T)n, (char_u *)save, FALSE) == FAIL)

  	{

! 	    PyErr_SET_VIM("cannot replace line");

  	    vim_free(save);

  	}

  	else

--- 3630,3641 ----

  	if (u_savesub((linenr_T)n) == FAIL)

  	{

! 	    RAISE_UNDO_FAIL;

  	    vim_free(save);

  	}

  	else if (ml_replace((linenr_T)n, (char_u *)save, FALSE) == FAIL)

  	{

! 	    RAISE_LINE_FAIL("replace");

  	    vim_free(save);

  	}

  	else

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

*** 3654,3667 ****

  	switch_buffer(&savebuf, buf);

  	if (u_savedel((linenr_T)lo, (long)n) == FAIL)

! 	    PyErr_SET_VIM("cannot save undo information");

  	else

  	{

  	    for (i = 0; i < n; ++i)

  	    {

  		if (ml_delete((linenr_T)lo, FALSE) == FAIL)

  		{

! 		    PyErr_SET_VIM("cannot delete line");

  		    break;

  		}

  	    }

--- 3690,3703 ----

  	switch_buffer(&savebuf, buf);

  	if (u_savedel((linenr_T)lo, (long)n) == FAIL)

! 	    RAISE_UNDO_FAIL;

  	else

  	{

  	    for (i = 0; i < n; ++i)

  	    {

  		if (ml_delete((linenr_T)lo, FALSE) == FAIL)

  		{

! 		    RAISE_LINE_FAIL("delete");

  		    break;

  		}

  	    }

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

*** 3722,3728 ****

  	switch_buffer(&savebuf, buf);

  	if (u_save((linenr_T)(lo-1), (linenr_T)hi) == FAIL)

! 	    PyErr_SET_VIM("cannot save undo information");

  	/* If the size of the range is reducing (ie, new_len < old_len) we

  	 * need to delete some old_len. We do this at the start, by

--- 3758,3764 ----

  	switch_buffer(&savebuf, buf);

  	if (u_save((linenr_T)(lo-1), (linenr_T)hi) == FAIL)

! 	    RAISE_UNDO_FAIL;

  	/* If the size of the range is reducing (ie, new_len < old_len) we

  	 * need to delete some old_len. We do this at the start, by

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

*** 3733,3739 ****

  	    for (i = 0; i < old_len - new_len; ++i)

  		if (ml_delete((linenr_T)lo, FALSE) == FAIL)

  		{

! 		    PyErr_SET_VIM("cannot delete line");

  		    break;

  		}

  	    extra -= i;

--- 3769,3775 ----

  	    for (i = 0; i < old_len - new_len; ++i)

  		if (ml_delete((linenr_T)lo, FALSE) == FAIL)

  		{

! 		    RAISE_LINE_FAIL("delete");

  		    break;

  		}

  	    extra -= i;

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

*** 3749,3755 ****

  		if (ml_replace((linenr_T)(lo+i), (char_u *)array[i], FALSE)

  								      == FAIL)

  		{

! 		    PyErr_SET_VIM("cannot replace line");

  		    break;

  		}

  	}

--- 3785,3791 ----

  		if (ml_replace((linenr_T)(lo+i), (char_u *)array[i], FALSE)

  								      == FAIL)

  		{

! 		    RAISE_LINE_FAIL("replace");

  		    break;

  		}

  	}

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

*** 3767,3773 ****

  		if (ml_append((linenr_T)(lo + i - 1),

  					(char_u *)array[i], 0, FALSE) == FAIL)

  		{

! 		    PyErr_SET_VIM("cannot insert line");

  		    break;

  		}

  		vim_free(array[i]);

--- 3803,3809 ----

  		if (ml_append((linenr_T)(lo + i - 1),

  					(char_u *)array[i], 0, FALSE) == FAIL)

  		{

! 		    RAISE_LINE_FAIL("insert");

  		    break;

  		}

  		vim_free(array[i]);

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

*** 3844,3852 ****

  	switch_buffer(&savebuf, buf);

  	if (u_save((linenr_T)n, (linenr_T)(n+1)) == FAIL)

! 	    PyErr_SET_VIM("cannot save undo information");

  	else if (ml_append((linenr_T)n, (char_u *)str, 0, FALSE) == FAIL)

! 	    PyErr_SET_VIM("cannot insert line");

  	else

  	    appended_lines_mark((linenr_T)n, 1L);

--- 3880,3888 ----

  	switch_buffer(&savebuf, buf);

  	if (u_save((linenr_T)n, (linenr_T)(n+1)) == FAIL)

! 	    RAISE_UNDO_FAIL;

  	else if (ml_append((linenr_T)n, (char_u *)str, 0, FALSE) == FAIL)

! 	    RAISE_LINE_FAIL("insert");

  	else

  	    appended_lines_mark((linenr_T)n, 1L);

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

*** 3895,3901 ****

  	switch_buffer(&savebuf, buf);

  	if (u_save((linenr_T)n, (linenr_T)(n + 1)) == FAIL)

! 	    PyErr_SET_VIM("cannot save undo information");

  	else

  	{

  	    for (i = 0; i < size; ++i)

--- 3931,3937 ----

  	switch_buffer(&savebuf, buf);

  	if (u_save((linenr_T)n, (linenr_T)(n + 1)) == FAIL)

! 	    RAISE_UNDO_FAIL;

  	else

  	{

  	    for (i = 0; i < size; ++i)

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

*** 3903,3909 ****

  		if (ml_append((linenr_T)(n + i),

  					(char_u *)array[i], 0, FALSE) == FAIL)

  		{

! 		    PyErr_SET_VIM("cannot insert line");

  		    /* Free the rest of the lines */

  		    while (i < size)

--- 3939,3945 ----

  		if (ml_append((linenr_T)(n + i),

  					(char_u *)array[i], 0, FALSE) == FAIL)

  		{

! 		    RAISE_LINE_FAIL("insert");

  		    /* Free the rest of the lines */

  		    while (i < size)

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

*** 4668,4674 ****

  	if (value->ob_type != &BufferType)

  	{

! 	    PyErr_SET_STRING(PyExc_TypeError, "expected vim.Buffer object");

  	    return -1;

  	}

--- 4704,4712 ----

  	if (value->ob_type != &BufferType)

  	{

! 	    PyErr_FORMAT(PyExc_TypeError,

! 		    "expected vim.Buffer object, but got %s",

! 		    Py_TYPE_NAME(value));

  	    return -1;

  	}

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

*** 4681,4687 ****

  	{

  	    if (VimTryEnd())

  		return -1;

! 	    PyErr_SET_VIM("failed to switch to given buffer");

  	    return -1;

  	}

--- 4719,4725 ----

  	{

  	    if (VimTryEnd())

  		return -1;

! 	    PyErr_VIM_FORMAT("failed to switch to buffer %d", count);

  	    return -1;

  	}

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

*** 4693,4699 ****

  	if (value->ob_type != &WindowType)

  	{

! 	    PyErr_SET_STRING(PyExc_TypeError, "expected vim.Window object");

  	    return -1;

  	}

--- 4731,4739 ----

  	if (value->ob_type != &WindowType)

  	{

! 	    PyErr_FORMAT(PyExc_TypeError,

! 		    "expected vim.Window object, but got %s",

! 		    Py_TYPE_NAME(value));

  	    return -1;

  	}

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

*** 4725,4731 ****

      {

  	if (value->ob_type != &TabPageType)

  	{

! 	    PyErr_SET_STRING(PyExc_TypeError, "expected vim.TabPage object");

  	    return -1;

  	}

--- 4765,4773 ----

      {

  	if (value->ob_type != &TabPageType)

  	{

! 	    PyErr_FORMAT(PyExc_TypeError,

! 		    "expected vim.TabPage object, but got %s",

! 		    Py_TYPE_NAME(value));

  	    return -1;

  	}

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

*** 5003,5012 ****

  	if (dict_add(dict, di) == FAIL)

  	{

  	    clear_tv(&di->di_tv);

  	    vim_free(di);

  	    dict_unref(dict);

- 	    PyErr_SET_VIM("failed to add key to dictionary");

  	    return -1;

  	}

      }

--- 5045,5054 ----

  	if (dict_add(dict, di) == FAIL)

  	{

+ 	    RAISE_KEY_ADD_FAIL(di->di_key);

  	    clear_tv(&di->di_tv);

  	    vim_free(di);

  	    dict_unref(dict);

  	    return -1;

  	}

      }

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

*** 5105,5114 ****

  	if (dict_add(dict, di) == FAIL)

  	{

  	    Py_DECREF(iterator);

  	    dictitem_free(di);

  	    dict_unref(dict);

- 	    PyErr_SET_VIM("failed to add key to dictionary");

  	    return -1;

  	}

      }

--- 5147,5156 ----

  	if (dict_add(dict, di) == FAIL)

  	{

+ 	    RAISE_KEY_ADD_FAIL(di->di_key);

  	    Py_DECREF(iterator);

  	    dictitem_free(di);

  	    dict_unref(dict);

  	    return -1;

  	}

      }

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

*** 5216,5223 ****

  	r = convert_dl(obj, tv, pymap_to_tv, lookup_dict);

      else

      {

! 	PyErr_SET_STRING(PyExc_TypeError,

! 		"unable to convert object to vim dictionary");

  	r = -1;

      }

      Py_DECREF(lookup_dict);

--- 5258,5266 ----

  	r = convert_dl(obj, tv, pymap_to_tv, lookup_dict);

      else

      {

! 	PyErr_FORMAT(PyExc_TypeError,

! 		"unable to convert %s to vim dictionary",

! 		Py_TYPE_NAME(obj));

  	r = -1;

      }

      Py_DECREF(lookup_dict);

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

*** 5326,5333 ****

  	return convert_dl(obj, tv, pymap_to_tv, lookup_dict);

      else

      {

! 	PyErr_SET_STRING(PyExc_TypeError,

! 		"unable to convert to vim structure");

  	return -1;

      }

      return 0;

--- 5369,5377 ----

  	return convert_dl(obj, tv, pymap_to_tv, lookup_dict);

      else

      {

! 	PyErr_FORMAT(PyExc_TypeError,

! 		"unable to convert %s to vim structure",

! 		Py_TYPE_NAME(obj));

  	return -1;

      }

      return 0;

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

*** 5338,5344 ****

  {

      if (tv == NULL)

      {

! 	PyErr_SET_VIM("NULL reference passed");

  	return NULL;

      }

      switch (tv->v_type)

--- 5382,5388 ----

  {

      if (tv == NULL)

      {

! 	PyErr_SET_VIM("internal error: NULL reference passed");

  	return NULL;

      }

      switch (tv->v_type)

*** ../vim-7.3.1229/src/if_python3.c	2013-06-23 13:28:11.000000000 +0200

--- src/if_python3.c	2013-06-23 13:31:16.000000000 +0200

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

*** 122,127 ****

--- 122,128 ----

  # define PyDict_SetItemString py3_PyDict_SetItemString

  # define PyErr_BadArgument py3_PyErr_BadArgument

  # define PyErr_Clear py3_PyErr_Clear

+ # define PyErr_Format py3_PyErr_Format

  # define PyErr_PrintEx py3_PyErr_PrintEx

  # define PyErr_NoMemory py3_PyErr_NoMemory

  # define PyErr_Occurred py3_PyErr_Occurred

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

*** 337,342 ****

--- 338,344 ----

  static void* (*py3_PyMem_Malloc)(size_t);

  static int (*py3_Py_IsInitialized)(void);

  static void (*py3_PyErr_Clear)(void);

+ static PyObject* (*py3_PyErr_Format)(PyObject *, const char *, ...);

  static void (*py3_PyErr_PrintEx)(int);

  static PyObject*(*py3__PyObject_Init)(PyObject *, PyTypeObject *);

  static iternextfunc py3__PyObject_NextNotImplemented;

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

*** 485,490 ****

--- 487,493 ----

      {"_Py_FalseStruct", (PYTHON_PROC*)&py3__Py_FalseStruct},

      {"_Py_TrueStruct", (PYTHON_PROC*)&py3__Py_TrueStruct},

      {"PyErr_Clear", (PYTHON_PROC*)&py3_PyErr_Clear},

+     {"PyErr_Format", (PYTHON_PROC*)&py3_PyErr_Format},

      {"PyErr_PrintEx", (PYTHON_PROC*)&py3_PyErr_PrintEx},

      {"PyObject_Init", (PYTHON_PROC*)&py3__PyObject_Init},

      {"PyModule_AddObject", (PYTHON_PROC*)&py3_PyModule_AddObject},

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

*** 1169,1175 ****

      }

      else

      {

! 	PyErr_SET_STRING(PyExc_TypeError, "index must be int or slice");

  	return NULL;

      }

  }