diff options
author | Tim Peters <tim.peters@gmail.com> | 2001-01-28 00:27:39 (GMT) |
---|---|---|
committer | Tim Peters <tim.peters@gmail.com> | 2001-01-28 00:27:39 (GMT) |
commit | d9b9ac855c6bb297e7d5549e0d140ff7f48ebee6 (patch) | |
tree | 7a139d6b7ad00442b813eb889b67758063be239e /Python/pythonrun.c | |
parent | 09ac1fde1ca8a5c8d9b2c8f767833d78210a8384 (diff) | |
download | cpython-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/pythonrun.c')
-rw-r--r-- | Python/pythonrun.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Python/pythonrun.c b/Python/pythonrun.c index 4c94f9b..5f90797 100644 --- a/Python/pythonrun.c +++ b/Python/pythonrun.c @@ -936,7 +936,7 @@ run_pyc_file(FILE *fp, char *filename, PyObject *globals, PyObject *locals) return NULL; } (void) PyMarshal_ReadLongFromFile(fp); - v = PyMarshal_ReadObjectFromFile(fp); + v = PyMarshal_ReadLastObjectFromFile(fp); fclose(fp); if (v == NULL || !PyCode_Check(v)) { Py_XDECREF(v); |