From 3f1af5c42e915775e9cc32224e090b05430a23de Mon Sep 17 00:00:00 2001 From: Victor Stinner Date: Fri, 12 Mar 2010 17:00:41 +0000 Subject: Issue #6697: use %U format instead of _PyUnicode_AsString(), because _PyUnicode_AsString() was not checked for error (NULL). The unicode string is no more truncated to 200 or 400 *bytes*. --- Python/ceval.c | 4 ++-- Python/import.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'Python') diff --git a/Python/ceval.c b/Python/ceval.c index 47c53cfa04..4e9f77be8a 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -3989,10 +3989,10 @@ update_keyword_args(PyObject *orig_kwdict, int nk, PyObject ***pp_stack, if (PyDict_GetItem(kwdict, key) != NULL) { PyErr_Format(PyExc_TypeError, "%.200s%s got multiple values " - "for keyword argument '%.200s'", + "for keyword argument '%U'", PyEval_GetFuncName(func), PyEval_GetFuncDesc(func), - _PyUnicode_AsString(key)); + key); Py_DECREF(key); Py_DECREF(value); Py_DECREF(kwdict); diff --git a/Python/import.c b/Python/import.c index 8a948b98f8..036d17e1be 100644 --- a/Python/import.c +++ b/Python/import.c @@ -2691,8 +2691,8 @@ PyImport_ReloadModule(PyObject *m) parent = PyDict_GetItem(modules, parentname); if (parent == NULL) { PyErr_Format(PyExc_ImportError, - "reload(): parent %.200s not in sys.modules", - _PyUnicode_AsString(parentname)); + "reload(): parent %U not in sys.modules", + parentname); Py_DECREF(parentname); imp_modules_reloading_clear(); return NULL; -- cgit v1.2.1