commit 0ea2a468e31b3ec20ae4281d9c28d1f5db7912d9
author Victor Stinner <victor.stinner@haypocalc.com> Fri Apr 30 00:22:08 2010 +0000
committer Victor Stinner <victor.stinner@haypocalc.com> Fri Apr 30 00:22:08 2010 +0000
tree 1f790a1882eafc1d538a1d72680df20e2f40ef81
parent 8130290d420fb7839da4dd5341e5eac960fd7560

Simplify PyUnicode_FSConverter(): remove reference to PyByteArray

PyByteArray is no more supported

Objects/unicodeobject.c

diff --git a/Objects/unicodeobject.c b/Objects/unicodeobject.c
index 3851008..369306e 100644
--- a/Objects/unicodeobject.c
+++ b/Objects/unicodeobject.c
@@ -1638,7 +1638,7 @@
         arg = PyUnicode_FromObject(arg);
         if (!arg)
             return 0;
-        output = PyUnicode_AsEncodedObject(arg, 
+        output = PyUnicode_AsEncodedObject(arg,
                                            Py_FileSystemDefaultEncoding,
                                            "surrogateescape");
         Py_DECREF(arg);
@@ -1650,14 +1650,8 @@
             return 0;
         }
     }
-    if (PyBytes_Check(output)) {
-         size = PyBytes_GET_SIZE(output);
-         data = PyBytes_AS_STRING(output);
-    } 
-    else {
-         size = PyByteArray_GET_SIZE(output);
-         data = PyByteArray_AS_STRING(output);
-    }
+    size = PyBytes_GET_SIZE(output);
+    data = PyBytes_AS_STRING(output);
     if (size != strlen(data)) {
         PyErr_SetString(PyExc_TypeError, "embedded NUL character");
         Py_DECREF(output);