Simplify code in marshal.c.

pitrou · pitrou · commit 1c13f84f5554 · 2012-03-02T18:22:23.000+01:00
diff --git a/Python/marshal.c b/Python/marshal.c
@@ -1239,7 +1239,6 @@ PyObject *
 PyMarshal_WriteObjectToString(PyObject *x, int version)
 {
     WFILE wf;
-    PyObject *res = NULL;
 
     wf.fp = NULL;
     wf.readable = NULL;
@@ -1273,12 +1272,7 @@ PyMarshal_WriteObjectToString(PyObject *x, int version)
                :"object too deeply nested to marshal");
         return NULL;
     }
-    if (wf.str != NULL) {
-        /* XXX Quick hack -- need to do this differently */
-        res = PyBytes_FromObject(wf.str);
-        Py_DECREF(wf.str);
-    }
-    return res;
+    return wf.str;
 }
 
 /* And an interface for Python programs... */

Original file line number	Diff line number	Diff line change
`@@ -1239,7 +1239,6 @@ PyObject *`
`1239`	`1239`	`PyMarshal_WriteObjectToString(PyObject *x, int version)`
`1240`	`1240`	`{`
`1241`	`1241`	`WFILE wf;`
`1242`		`- PyObject *res = NULL;`
`1243`	`1242`
`1244`	`1243`	`wf.fp = NULL;`
`1245`	`1244`	`wf.readable = NULL;`
`@@ -1273,12 +1272,7 @@ PyMarshal_WriteObjectToString(PyObject *x, int version)`
`1273`	`1272`	`:"object too deeply nested to marshal");`
`1274`	`1273`	`return NULL;`
`1275`	`1274`	`}`
`1276`		`- if (wf.str != NULL) {`
`1277`		`- /* XXX Quick hack -- need to do this differently */`
`1278`		`- res = PyBytes_FromObject(wf.str);`
`1279`		`- Py_DECREF(wf.str);`
`1280`		`- }`
`1281`		`- return res;`
	`1275`	`+ return wf.str;`
`1282`	`1276`	`}`
`1283`	`1277`
`1284`	`1278`	`/* And an interface for Python programs... */`