Kaydet (Commit) cd795963 authored tarafından Neal Norwitz's avatar Neal Norwitz

Use unicode for much of errors.

üst 11e065b3
...@@ -350,7 +350,7 @@ PyErr_SetFromErrnoWithFilenameObject(PyObject *exc, PyObject *filenameObject) ...@@ -350,7 +350,7 @@ PyErr_SetFromErrnoWithFilenameObject(PyObject *exc, PyObject *filenameObject)
PyObject * PyObject *
PyErr_SetFromErrnoWithFilename(PyObject *exc, char *filename) 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); PyObject *result = PyErr_SetFromErrnoWithFilenameObject(exc, name);
Py_XDECREF(name); Py_XDECREF(name);
return result; return result;
...@@ -429,7 +429,7 @@ PyObject *PyErr_SetExcFromWindowsErrWithFilename( ...@@ -429,7 +429,7 @@ PyObject *PyErr_SetExcFromWindowsErrWithFilename(
int ierr, int ierr,
const char *filename) const char *filename)
{ {
PyObject *name = filename ? PyString_FromString(filename) : NULL; PyObject *name = filename ? PyUnicode_FromString(filename) : NULL;
PyObject *ret = PyErr_SetExcFromWindowsErrWithFilenameObject(exc, PyObject *ret = PyErr_SetExcFromWindowsErrWithFilenameObject(exc,
ierr, ierr,
name); name);
...@@ -468,7 +468,7 @@ PyObject *PyErr_SetFromWindowsErrWithFilename( ...@@ -468,7 +468,7 @@ PyObject *PyErr_SetFromWindowsErrWithFilename(
int ierr, int ierr,
const char *filename) const char *filename)
{ {
PyObject *name = filename ? PyString_FromString(filename) : NULL; PyObject *name = filename ? PyUnicode_FromString(filename) : NULL;
PyObject *result = PyErr_SetExcFromWindowsErrWithFilenameObject( PyObject *result = PyErr_SetExcFromWindowsErrWithFilenameObject(
PyExc_WindowsError, PyExc_WindowsError,
ierr, name); ierr, name);
...@@ -558,7 +558,7 @@ PyErr_NewException(char *name, PyObject *base, PyObject *dict) ...@@ -558,7 +558,7 @@ PyErr_NewException(char *name, PyObject *base, PyObject *dict)
goto failure; goto failure;
} }
if (PyDict_GetItemString(dict, "__module__") == NULL) { if (PyDict_GetItemString(dict, "__module__") == NULL) {
modulename = PyString_FromStringAndSize(name, modulename = PyUnicode_FromStringAndSize(name,
(Py_ssize_t)(dot-name)); (Py_ssize_t)(dot-name));
if (modulename == NULL) if (modulename == NULL)
goto failure; goto failure;
...@@ -610,7 +610,7 @@ PyErr_WriteUnraisable(PyObject *obj) ...@@ -610,7 +610,7 @@ PyErr_WriteUnraisable(PyObject *obj)
if (moduleName == NULL) if (moduleName == NULL)
PyFile_WriteString("<unknown>", f); PyFile_WriteString("<unknown>", f);
else { else {
char* modstr = PyString_AsString(moduleName); char* modstr = PyUnicode_AsString(moduleName);
if (modstr && if (modstr &&
strcmp(modstr, "__builtin__") != 0) strcmp(modstr, "__builtin__") != 0)
{ {
...@@ -728,7 +728,7 @@ PyErr_SyntaxLocation(const char *filename, int lineno) ...@@ -728,7 +728,7 @@ PyErr_SyntaxLocation(const char *filename, int lineno)
Py_DECREF(tmp); Py_DECREF(tmp);
} }
if (filename != NULL) { if (filename != NULL) {
tmp = PyString_FromString(filename); tmp = PyUnicode_FromString(filename);
if (tmp == NULL) if (tmp == NULL)
PyErr_Clear(); PyErr_Clear();
else { else {
...@@ -805,7 +805,7 @@ PyErr_ProgramText(const char *filename, int lineno) ...@@ -805,7 +805,7 @@ PyErr_ProgramText(const char *filename, int lineno)
char *p = linebuf; char *p = linebuf;
while (*p == ' ' || *p == '\t' || *p == '\014') while (*p == ' ' || *p == '\t' || *p == '\014')
p++; p++;
return PyString_FromString(p); return PyUnicode_FromString(p);
} }
return NULL; return NULL;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment