From: Vinay Sajip <vinay_sajip@yahoo.co.uk>
Date: Sat, 2 Jul 2011 16:19:51 +0000 (+0100)
Subject: Removed breaking typo accidentally introduced during merge with 3.2.
X-Git-Tag: v3.3.0a1~1980^2~9
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=32322843914c144f8c741470c5450c0cb7d9f7df;p=thirdparty%2FPython%2Fcpython.git

Removed breaking typo accidentally introduced during merge with 3.2.
---

diff --git a/Python/marshal.c b/Python/marshal.c
index b8d06ad28648..c749bb335766 100644
--- a/Python/marshal.c
+++ b/Python/marshal.c
@@ -1320,8 +1320,6 @@ marshal_load(PyObject *self, PyObject *f)
 {
     PyObject *data, *result;
     RFILE rf;
-    char *p;
-    int n;
 
     /*
      * Make a call to the read method, but read zero bytes.
@@ -1338,12 +1336,10 @@ marshal_load(PyObject *self, PyObject *f)
         result = NULL;
     }
     else {
-        rf.strings = PyList_New(0);
         rf.depth = 0;
         rf.fp = NULL;
         rf.readable = f;
         result = read_object(&rf);
-        Py_DECREF(rf.strings);
     }
     Py_DECREF(data);
     return result;