mirrors/cpython
0
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2024-11-23 18:04:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Any call to marshal.dumps() with the new optional argument 'version' just

Browse Source 
immediately segfaults, due to a typo!  This was obviously never tested...
Added a test for it, and also fixed the documentation.
This commit is contained in:
Armin Rigo 2004-12-20 12:25:57 +00:00
parent f964154b8c
commit 2ccea17856
3 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Doc/lib/libmarshal.tex
View File

@ -62,7 +62,7 @@ operating on strings.
The module defines these functions:
\begin{funcdesc}{dump}{value, file}
\begin{funcdesc}{dump}{value, file\optional{, version}}
Write the value on the open file. The value must be a supported
type. The file must be an open file object such as
\code{sys.stdout} or returned by \function{open()} or
@ -75,7 +75,7 @@ The module defines these functions:
read back by \function{load()}.
\versionadded[The \var{version} argument indicates the data
format that \code{dumps} should use.]{2.4}
format that \code{dump} should use (see below)]{2.4}
\end{funcdesc}
\begin{funcdesc}{load}{file}
@ -96,7 +96,7 @@ The module defines these functions:
contains an object that has) an unsupported type.
\versionadded[The \var{version} argument indicates the data
format that \code{dumps} should use.]{2.4}
format that \code{dumps} should use (see below)]{2.4}
\end{funcdesc}
\begin{funcdesc}{loads}{string}

5
Lib/test/test_marshal.py
View File

@ -180,6 +180,11 @@ class BugsTestCase(unittest.TestCase):
self.assertRaises(Exception, marshal.loads, 'f')
self.assertRaises(Exception, marshal.loads, marshal.dumps(5L)[:-1])
def test_version_argument(self):
# Python 2.4.0 crashes for any call to marshal.dumps(x, y)
self.assertEquals(marshal.loads(marshal.dumps(5, 0)), 5)
self.assertEquals(marshal.loads(marshal.dumps(5, 1)), 5)
def test_main():
test_support.run_unittest(IntTestCase,
FloatTestCase,

2
Python/marshal.c
View File

@ -893,7 +893,7 @@ marshal_dumps(PyObject *self, PyObject *args)
{
PyObject *x;
int version = Py_MARSHAL_VERSION;
if (!PyArg_ParseTuple(args, "O|i:dumps", &x, version))
if (!PyArg_ParseTuple(args, "O|i:dumps", &x, &version))
return NULL;
return PyMarshal_WriteObjectToString(x, version);
}