From: Antoine Pitrou <solipsis@pitrou.net>
Date: Fri, 2 Mar 2012 17:22:23 +0000 (+0100)
Subject: Simplify code in marshal.c.
X-Git-Tag: v3.3.0a1~16
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=1c13f84f5554cecbdce8bf42dbfb609c1f72282a;p=thirdparty%2FPython%2Fcpython.git

Simplify code in marshal.c.
---

diff --git a/Python/marshal.c b/Python/marshal.c
index 17353b2d580a..77824d4129b8 100644
--- 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... */