[Python-checkins] r80640 - python/branches/py3k/Objects/unicodeobject.c

[victor.stinner]

Author: victor.stinner
Date: Fri Apr 30 02:22:08 2010
New Revision: 80640

Log:
Simplify PyUnicode_FSConverter(): remove reference to PyByteArray

PyByteArray is no more supported


Modified:
   python/branches/py3k/Objects/unicodeobject.c

Modified: python/branches/py3k/Objects/unicodeobject.c
==============================================================================
--- python/branches/py3k/Objects/unicodeobject.c	(original)
+++ python/branches/py3k/Objects/unicodeobject.c	Fri Apr 30 02:22:08 2010
@@ -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);