summaryrefslogtreecommitdiff
path: root/Python
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2011-07-02 17:19:51 +0100
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2011-07-02 17:19:51 +0100
commit635eaf2d0553df0712a7a9b332d1917f0aed4789 (patch)
tree8c26465ac47bc4fe13ecc9d0a27b850dde79bfd7 /Python
parentf8e95330cb65b8caf7abf81e6cd000b77da4a3f0 (diff)
downloadcpython-635eaf2d0553df0712a7a9b332d1917f0aed4789.tar.gz
Removed breaking typo accidentally introduced during merge with 3.2.
Diffstat (limited to 'Python')
-rw-r--r--Python/marshal.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/Python/marshal.c b/Python/marshal.c
index b8d06ad286..c749bb3357 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;