diff options
| author | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-21 21:05:53 (GMT) |
|---|---|---|
| committer | Victor Stinner <victor.stinner@haypocalc.com> | 2010-03-21 21:05:53 (GMT) |
| commit | 38c36f857600c72a094c65010d51342a1fd73658 (patch) | |
| tree | e85caabd68ef137e309f9365019a9eb40eca88ff /Python | |
| parent | 19495a7adc505581734058a74c1a3476267bab40 (diff) | |
| download | cpython-38c36f857600c72a094c65010d51342a1fd73658.zip cpython-38c36f857600c72a094c65010d51342a1fd73658.tar.gz cpython-38c36f857600c72a094c65010d51342a1fd73658.tar.bz2 | |
Merged revisions 78875 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
........
r78875 | victor.stinner | 2010-03-12 18:00:41 +0100 (ven., 12 mars 2010) | 5 lines
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*.
........
Diffstat (limited to 'Python')
| -rw-r--r-- | Python/ceval.c | 4 | ||||
| -rw-r--r-- | Python/import.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Python/ceval.c b/Python/ceval.c index f793db3..c807ecc 100644 --- a/Python/ceval.c +++ b/Python/ceval.c @@ -3883,10 +3883,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 1129a7f..5da4c51 100644 --- a/Python/import.c +++ b/Python/import.c @@ -2694,8 +2694,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; |