Mercurial > cpython-lru_cache-weakref
diff Python/errors.c @ 42793:61fb597917d1
Use unicode for much of errors.
| author | Neal Norwitz <nnorwitz@gmail.com> |
|---|---|
| date | Fri, 24 Aug 2007 19:54:13 +0000 |
| parents | 0fcc18aba385 |
| children | 84618b2064c1 |
line wrap: on
line diff
--- a/Python/errors.c Fri Aug 24 19:15:12 2007 +0000 +++ b/Python/errors.c Fri Aug 24 19:54:13 2007 +0000 @@ -350,7 +350,7 @@ PyObject * PyErr_SetFromErrnoWithFilename(PyObject *exc, char *filename) { - PyObject *name = filename ? PyString_FromString(filename) : NULL; + PyObject *name = filename ? PyUnicode_FromString(filename) : NULL; PyObject *result = PyErr_SetFromErrnoWithFilenameObject(exc, name); Py_XDECREF(name); return result; @@ -429,7 +429,7 @@ int ierr, const char *filename) { - PyObject *name = filename ? PyString_FromString(filename) : NULL; + PyObject *name = filename ? PyUnicode_FromString(filename) : NULL; PyObject *ret = PyErr_SetExcFromWindowsErrWithFilenameObject(exc, ierr, name); @@ -468,7 +468,7 @@ int ierr, const char *filename) { - PyObject *name = filename ? PyString_FromString(filename) : NULL; + PyObject *name = filename ? PyUnicode_FromString(filename) : NULL; PyObject *result = PyErr_SetExcFromWindowsErrWithFilenameObject( PyExc_WindowsError, ierr, name); @@ -558,7 +558,7 @@ goto failure; } if (PyDict_GetItemString(dict, "__module__") == NULL) { - modulename = PyString_FromStringAndSize(name, + modulename = PyUnicode_FromStringAndSize(name, (Py_ssize_t)(dot-name)); if (modulename == NULL) goto failure; @@ -610,7 +610,7 @@ if (moduleName == NULL) PyFile_WriteString("<unknown>", f); else { - char* modstr = PyString_AsString(moduleName); + char* modstr = PyUnicode_AsString(moduleName); if (modstr && strcmp(modstr, "__builtin__") != 0) { @@ -728,7 +728,7 @@ Py_DECREF(tmp); } if (filename != NULL) { - tmp = PyString_FromString(filename); + tmp = PyUnicode_FromString(filename); if (tmp == NULL) PyErr_Clear(); else { @@ -805,7 +805,7 @@ char *p = linebuf; while (*p == ' ' || *p == '\t' || *p == '\014') p++; - return PyString_FromString(p); + return PyUnicode_FromString(p); } return NULL; }