Commit 1c13f84f authored by Antoine Pitrou's avatar Antoine Pitrou

Simplify code in marshal.c.

parent b2677c73
...@@ -1239,7 +1239,6 @@ PyObject * ...@@ -1239,7 +1239,6 @@ PyObject *
PyMarshal_WriteObjectToString(PyObject *x, int version) PyMarshal_WriteObjectToString(PyObject *x, int version)
{ {
WFILE wf; WFILE wf;
PyObject *res = NULL;
wf.fp = NULL; wf.fp = NULL;
wf.readable = NULL; wf.readable = NULL;
...@@ -1273,12 +1272,7 @@ PyMarshal_WriteObjectToString(PyObject *x, int version) ...@@ -1273,12 +1272,7 @@ PyMarshal_WriteObjectToString(PyObject *x, int version)
:"object too deeply nested to marshal"); :"object too deeply nested to marshal");
return NULL; return NULL;
} }
if (wf.str != NULL) { return wf.str;
/* XXX Quick hack -- need to do this differently */
res = PyBytes_FromObject(wf.str);
Py_DECREF(wf.str);
}
return res;
} }
/* And an interface for Python programs... */ /* And an interface for Python programs... */
......
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