diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | src/if_py_both.h | 20 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 17 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore index 8bfd0ca7f..eff38a83e 100644 --- a/.gitignore +++ b/.gitignore @@ -36,6 +36,9 @@ src/Obj*/pathdef.c gvimext.dll gvimext.lib +# Mac OSX +src/xxd/xxd.dSYM + # All platforms *.rej *.orig diff --git a/src/if_py_both.h b/src/if_py_both.h index 4f977c38c..d66e2cbd1 100644 --- a/src/if_py_both.h +++ b/src/if_py_both.h @@ -139,13 +139,15 @@ StringToChars(PyObject *obj, PyObject **todecref) } else { - PyErr_FORMAT(PyExc_TypeError, #if PY_MAJOR_VERSION < 3 - N_("expected str() or unicode() instance, but got %s") + PyErr_FORMAT(PyExc_TypeError, + N_("expected str() or unicode() instance, but got %s"), + Py_TYPE_NAME(obj)); #else - N_("expected bytes() or str() instance, but got %s") + PyErr_FORMAT(PyExc_TypeError, + N_("expected bytes() or str() instance, but got %s"), + Py_TYPE_NAME(obj)); #endif - , Py_TYPE_NAME(obj)); return NULL; } @@ -191,15 +193,17 @@ NumberToLong(PyObject *obj, long *result, int flags) } else { - PyErr_FORMAT(PyExc_TypeError, #if PY_MAJOR_VERSION < 3 + PyErr_FORMAT(PyExc_TypeError, N_("expected int(), long() or something supporting " - "coercing to long(), but got %s") + "coercing to long(), but got %s"), + Py_TYPE_NAME(obj)); #else + PyErr_FORMAT(PyExc_TypeError, N_("expected int() or something supporting coercing to int(), " - "but got %s") + "but got %s"), + Py_TYPE_NAME(obj)); #endif - , Py_TYPE_NAME(obj)); return -1; } diff --git a/src/version.c b/src/version.c index 954147250..203daed52 100644 --- a/src/version.c +++ b/src/version.c @@ -729,6 +729,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1239, +/**/ 1238, /**/ 1237, |