summaryrefslogtreecommitdiffstats
path: root/Python/import.c
diff options
context:
space:
mode:
authorTim Peters <tim.peters@gmail.com>2001-01-28 00:27:39 (GMT)
committerTim Peters <tim.peters@gmail.com>2001-01-28 00:27:39 (GMT)
commitd9b9ac855c6bb297e7d5549e0d140ff7f48ebee6 (patch)
tree7a139d6b7ad00442b813eb889b67758063be239e /Python/import.c
parent09ac1fde1ca8a5c8d9b2c8f767833d78210a8384 (diff)
downloadcpython-d9b9ac855c6bb297e7d5549e0d140ff7f48ebee6.zip
cpython-d9b9ac855c6bb297e7d5549e0d140ff7f48ebee6.tar.gz
cpython-d9b9ac855c6bb297e7d5549e0d140ff7f48ebee6.tar.bz2
It's unclear whether PyMarshal_XXX() are part of the public or private API.
They're named as if public, so I did a Bad Thing by changing PyMarshal_ReadObjectFromFile() to suck up the remainder of the file in one gulp: anyone who counted on that leaving the file pointer merely at the end of the next object would be screwed. So restored PyMarshal_ReadObjectFromFile() to its earlier state, renamed the new greedy code to PyMarshal_ReadLastObjectFromFile(), and changed Python internals to call the latter instead.
Diffstat (limited to 'Python/import.c')
-rw-r--r--Python/import.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/import.c b/Python/import.c
index 8cc4449..533fed5 100644
--- a/Python/import.c
+++ b/Python/import.c
@@ -555,7 +555,7 @@ read_compiled_module(char *cpathname, FILE *fp)
{
PyObject *co;
- co = PyMarshal_ReadObjectFromFile(fp);
+ co = PyMarshal_ReadLastObjectFromFile(fp);
/* Ugly: rd_object() may return NULL with or without error */
if (co == NULL || !PyCode_Check(co)) {
if (!PyErr_Occurred())