Rename utf8b error handler to surrogateescape.
diff --git a/Modules/_io/fileio.c b/Modules/_io/fileio.c
index 164f7e4..555dc12 100644
--- a/Modules/_io/fileio.c
+++ b/Modules/_io/fileio.c
@@ -245,7 +245,7 @@
return -1;
stringobj = PyUnicode_AsEncodedString(
- u, Py_FileSystemDefaultEncoding, "utf8b");
+ u, Py_FileSystemDefaultEncoding, "surrogateescape");
Py_DECREF(u);
if (stringobj == NULL)
return -1;
diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c
index 2050d5a..21dcb4d 100644
--- a/Modules/posixmodule.c
+++ b/Modules/posixmodule.c
@@ -494,13 +494,13 @@
if (p == NULL)
continue;
k = PyUnicode_Decode(*e, (int)(p-*e),
- Py_FileSystemDefaultEncoding, "utf8b");
+ Py_FileSystemDefaultEncoding, "surrogateescape");
if (k == NULL) {
PyErr_Clear();
continue;
}
v = PyUnicode_Decode(p+1, strlen(p+1),
- Py_FileSystemDefaultEncoding, "utf8b");
+ Py_FileSystemDefaultEncoding, "surrogateescape");
if (v == NULL) {
PyErr_Clear();
Py_DECREF(k);
@@ -2167,7 +2167,7 @@
return posix_error();
if (use_bytes)
return PyBytes_FromStringAndSize(buf, strlen(buf));
- return PyUnicode_Decode(buf, strlen(buf), Py_FileSystemDefaultEncoding,"utf8b");
+ return PyUnicode_Decode(buf, strlen(buf), Py_FileSystemDefaultEncoding,"surrogateescape");
}
PyDoc_STRVAR(posix_getcwd__doc__,
@@ -2513,7 +2513,7 @@
w = PyUnicode_FromEncodedObject(v,
Py_FileSystemDefaultEncoding,
- "utf8b");
+ "surrogateescape");
Py_DECREF(v);
if (w != NULL)
v = w;
@@ -4695,7 +4695,7 @@
w = PyUnicode_FromEncodedObject(v,
Py_FileSystemDefaultEncoding,
- "utf8b");
+ "surrogateescape");
if (w != NULL) {
Py_DECREF(v);
v = w;
diff --git a/Modules/python.c b/Modules/python.c
index 4c0a55b..13c6d5b 100644
--- a/Modules/python.c
+++ b/Modules/python.c
@@ -42,7 +42,7 @@
return res;
PyMem_Free(res);
}
- /* Conversion failed. Fall back to escaping with utf8b. */
+ /* Conversion failed. Fall back to escaping with surrogateescape. */
#ifdef HAVE_MBRTOWC
/* Try conversion with mbrtwoc (C99), and escape non-decodable bytes. */