ilusha/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython synced 2026-09-29 12:10:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added a HIGHEST_PROTOCOL module attribute to pickle and cPickle.

Browse source
This commit is contained in:
Tim Peters 2003-02-13 15:44:41 +00:00
parent fe62bc917d
commit 8587b3c073
3 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

14
Modules/cPickle.c
View file

@ -15,7 +15,7 @@ PyDoc_STRVAR(cPickle_module_documentation,
#define WRITE_BUF_SIZE 256
/* Bump this when new opcodes are added to the pickle protocol. */
#define CURRENT_PROTOCOL_NUMBER 2
#define HIGHEST_PROTOCOL 2
/*
* Pickle opcodes. These must be kept in synch with pickle.py. Extensive
@ -2743,11 +2743,11 @@ newPicklerobject(PyObject *file, int proto)
Picklerobject *self;
if (proto < 0)
proto = CURRENT_PROTOCOL_NUMBER;
if (proto > CURRENT_PROTOCOL_NUMBER) {
proto = HIGHEST_PROTOCOL;
if (proto > HIGHEST_PROTOCOL) {
PyErr_Format(PyExc_ValueError, "pickle protocol %d asked for; "
"the highest available protocol is %d",
proto, CURRENT_PROTOCOL_NUMBER);
proto, HIGHEST_PROTOCOL);
return NULL;
}
@ -4308,7 +4308,7 @@ load_proto(Unpicklerobject *self)
* int when chewing on 1 byte.
*/
assert(i >= 0);
if (i <= CURRENT_PROTOCOL_NUMBER)
if (i <= HIGHEST_PROTOCOL)
return 0;
PyErr_Format(PyExc_ValueError, "unsupported pickle protocol: %d", i);
@ -5562,6 +5562,10 @@ initcPickle(void)
}
Py_DECREF(di);
i = PyModule_AddIntConstant(m, "HIGHEST_PROTOCOL", HIGHEST_PROTOCOL);
if (i < 0)
return;
/* These are purely informational; no code uses them. */
/* File format version we write. */
format_version = PyString_FromString("2.0");