summaryrefslogtreecommitdiffstats
path: root/Python
diff options
context:
space:
mode:
authorVinay Sajip <vinay_sajip@yahoo.co.uk>2011-07-02 16:19:51 (GMT)
committerVinay Sajip <vinay_sajip@yahoo.co.uk>2011-07-02 16:19:51 (GMT)
commit32322843914c144f8c741470c5450c0cb7d9f7df (patch)
tree8e76426f48b72344c9ec32f2efe13201af71f1af /Python
parent65897a386e7980a736e3492eecc9bdbb706bf4f9 (diff)
downloadcpython-32322843914c144f8c741470c5450c0cb7d9f7df.zip
cpython-32322843914c144f8c741470c5450c0cb7d9f7df.tar.gz
cpython-32322843914c144f8c741470c5450c0cb7d9f7df.tar.bz2
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 b8d06ad..c749bb3 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;