Get rid of some dead code and unneeded XXX comments by Neal.
diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index e9f97df..b345986 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -1189,17 +1189,9 @@
return v;
if (errors != NULL)
Py_FatalError("non-NULL encoding in _PyUnicode_AsDefaultEncodedString");
- /* XXX(nnorwitz): errors will always be NULL due to the check above.
- Should this check and the else be removed since it's dead code?
- */
- if (errors == NULL) {
- b = PyUnicode_EncodeUTF8(PyUnicode_AS_UNICODE(unicode),
- PyUnicode_GET_SIZE(unicode),
- NULL);
- }
- else {
- b = PyUnicode_AsEncodedString(unicode, NULL, errors);
- }
+ b = PyUnicode_EncodeUTF8(PyUnicode_AS_UNICODE(unicode),
+ PyUnicode_GET_SIZE(unicode),
+ NULL);
if (!b)
return NULL;
v = PyString_FromStringAndSize(PyBytes_AsString(b),