cpython-lru_cache-weakref: Python/marshal.c annotate

annotate Python/marshal.c @ 86913:8c9769b17171 3.2

Backout 7d399099334d.

author	Georg Brandl <georg@python.org>
date	Mon, 04 Nov 2013 07:44:29 +0100
parents	e0464fa28c85
children	b48e1cd2d3be

rev	line source
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	2 /* Write Python objects to files and read them back.
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	3 This is intended for writing and reading compiled Python code only;
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	4 a true persistent storage facility would be much harder, since
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	5 it would have to take circular links and sharing into account. */
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	6
36792 688795873ff1 Make Py_ssize_t clean. Thomas Wouters <thomas@python.org> parents: 36784 diff changeset	7 #define PY_SSIZE_T_CLEAN
688795873ff1 Make Py_ssize_t clean. Thomas Wouters <thomas@python.org> parents: 36784 diff changeset	8
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	9 #include "Python.h"
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	10 #include "longintrepr.h"
35742 1c4d192f1568 Merge ast-branch to head Jeremy Hylton <jeremy@alum.mit.edu> parents: 35346 diff changeset	11 #include "code.h"
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	12 #include "marshal.h"
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	13
52215 bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	14 #define ABS(x) ((x) < 0 ? -(x) : (x))
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	15
13070 7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	16 /* High water mark to determine when the marshalled object is dangerously deep
7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	17 * and risks coring the interpreter. When the object stack gets this deep,
7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	18 * raise an exception instead of continuing.
43007 5fde5d6964d7 [Oops, I forgot half of the patch.] Guido van Rossum <guido@python.org> parents: 42665 diff changeset	19 * On Windows debug builds, reduce this value.
13070 7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	20 */
43007 5fde5d6964d7 [Oops, I forgot half of the patch.] Guido van Rossum <guido@python.org> parents: 42665 diff changeset	21 #if defined(MS_WINDOWS) && defined(_DEBUG)
5fde5d6964d7 [Oops, I forgot half of the patch.] Guido van Rossum <guido@python.org> parents: 42665 diff changeset	22 #define MAX_MARSHAL_STACK_DEPTH 1500
5fde5d6964d7 [Oops, I forgot half of the patch.] Guido van Rossum <guido@python.org> parents: 42665 diff changeset	23 #else
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	24 #define MAX_MARSHAL_STACK_DEPTH 2000
43007 5fde5d6964d7 [Oops, I forgot half of the patch.] Guido van Rossum <guido@python.org> parents: 42665 diff changeset	25 #endif
13070 7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	26
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	27 #define TYPE_NULL '0'
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	28 #define TYPE_NONE 'N'
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	29 #define TYPE_FALSE 'F'
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	30 #define TYPE_TRUE 'T'
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	31 #define TYPE_STOPITER 'S'
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	32 #define TYPE_ELLIPSIS '.'
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	33 #define TYPE_INT 'i'
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	34 #define TYPE_INT64 'I'
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	35 #define TYPE_FLOAT 'f'
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	36 #define TYPE_BINARY_FLOAT 'g'
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	37 #define TYPE_COMPLEX 'x'
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	38 #define TYPE_BINARY_COMPLEX 'y'
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	39 #define TYPE_LONG 'l'
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	40 #define TYPE_STRING 's'
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	41 #define TYPE_TUPLE '('
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	42 #define TYPE_LIST '['
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	43 #define TYPE_DICT '{'
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	44 #define TYPE_CODE 'c'
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	45 #define TYPE_UNICODE 'u'
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	46 #define TYPE_UNKNOWN '?'
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	47 #define TYPE_SET '<'
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	48 #define TYPE_FROZENSET '>'
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	49
53300 ed3f51f2abfb Added handling of PyOS_double_to_string out-of-memory errors. Closes issue 5775. Eric Smith <eric@trueblade.com> parents: 53192 diff changeset	50 #define WFERR_OK 0
ed3f51f2abfb Added handling of PyOS_double_to_string out-of-memory errors. Closes issue 5775. Eric Smith <eric@trueblade.com> parents: 53192 diff changeset	51 #define WFERR_UNMARSHALLABLE 1
ed3f51f2abfb Added handling of PyOS_double_to_string out-of-memory errors. Closes issue 5775. Eric Smith <eric@trueblade.com> parents: 53192 diff changeset	52 #define WFERR_NESTEDTOODEEP 2
ed3f51f2abfb Added handling of PyOS_double_to_string out-of-memory errors. Closes issue 5775. Eric Smith <eric@trueblade.com> parents: 53192 diff changeset	53 #define WFERR_NOMEMORY 3
ed3f51f2abfb Added handling of PyOS_double_to_string out-of-memory errors. Closes issue 5775. Eric Smith <eric@trueblade.com> parents: 53192 diff changeset	54
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	55 typedef struct {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	56 FILE *fp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	57 int error; /* see WFERR_* values */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	58 int depth;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	59 /* If fp == NULL, the following are valid: */
71554 9e293f617544 Fix style in code added by edba722f3b02 Éric Araujo <merwok@netwok.org> parents: 71134 diff changeset	60 PyObject readable; / Stream-like object being read from */
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	61 PyObject *str;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	62 char *ptr;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	63 char *end;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	64 PyObject strings; / dict on marshal, list on unmarshal */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	65 int version;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	66 } WFILE;
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	67
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	68 #define w_byte(c, p) if (((p)->fp)) putc((c), (p)->fp); \
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	69 else if ((p)->ptr != (p)->end) *(p)->ptr++ = (c); \
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	70 else w_more(c, p)
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	71
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	72 static void
13672 bfc5b2a8c11f -- changed w_more to take an integer instead of a char Fredrik Lundh <fredrik@pythonware.com> parents: 13658 diff changeset	73 w_more(int c, WFILE *p)
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	74 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	75 Py_ssize_t size, newsize;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	76 if (p->str == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	77 return; /* An error already occurred */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	78 size = PyBytes_Size(p->str);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	79 newsize = size + size + 1024;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	80 if (newsize > 3210241024) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	81 newsize = size + (size >> 3); /* 12.5% overallocation */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	82 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	83 if (_PyBytes_Resize(&p->str, newsize) != 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	84 p->ptr = p->end = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	85 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	86 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	87 p->ptr = PyBytes_AS_STRING((PyBytesObject *)p->str) + size;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	88 p->end =
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	89 PyBytes_AS_STRING((PyBytesObject *)p->str) + newsize;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	90 *p->ptr++ = Py_SAFE_DOWNCAST(c, int, char);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	91 }
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	92 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	93
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	94 static void
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	95 w_string(char s, Py_ssize_t n, WFILE p)
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	96 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	97 if (p->fp != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	98 fwrite(s, 1, n, p->fp);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	99 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	100 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	101 while (--n >= 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	102 w_byte(*s, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	103 s++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	104 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	105 }
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	106 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	107
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	108 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	109 w_short(int x, WFILE *p)
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	110 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	111 w_byte((char)( x & 0xff), p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	112 w_byte((char)((x>> 8) & 0xff), p);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	113 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	114
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	115 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	116 w_long(long x, WFILE *p)
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	117 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	118 w_byte((char)( x & 0xff), p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	119 w_byte((char)((x>> 8) & 0xff), p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	120 w_byte((char)((x>>16) & 0xff), p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	121 w_byte((char)((x>>24) & 0xff), p);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	122 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	123
4656 186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	124 #if SIZEOF_LONG > 4
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	125 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	126 w_long64(long x, WFILE *p)
4592 3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	127 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	128 w_long(x, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	129 w_long(x>>32, p);
4592 3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	130 }
4656 186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	131 #endif
4592 3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	132
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	133 #define SIZE32_MAX 0x7FFFFFFF
e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	134
e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	135 #if SIZEOF_SIZE_T > 4
e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	136 # define W_SIZE(n, p) do { \
e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	137 if ((n) > SIZE32_MAX) { \
e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	138 (p)->depth--; \
e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	139 (p)->error = WFERR_UNMARSHALLABLE; \
e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	140 return; \
e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	141 } \
e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	142 w_long((long)(n), p); \
e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	143 } while(0)
e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	144 #else
e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	145 # define W_SIZE w_long
e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	146 #endif
e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	147
52215 bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	148 /* We assume that Python longs are stored internally in base some power of
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	149 2**15; for the sake of portability we'll always read and write them in base
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	150 exactly 2*15. /
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	151
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	152 #define PyLong_MARSHAL_SHIFT 15
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	153 #define PyLong_MARSHAL_BASE ((short)1 << PyLong_MARSHAL_SHIFT)
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	154 #define PyLong_MARSHAL_MASK (PyLong_MARSHAL_BASE - 1)
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	155 #if PyLong_SHIFT % PyLong_MARSHAL_SHIFT != 0
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	156 #error "PyLong_SHIFT must be a multiple of PyLong_MARSHAL_SHIFT"
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	157 #endif
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	158 #define PyLong_MARSHAL_RATIO (PyLong_SHIFT / PyLong_MARSHAL_SHIFT)
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	159
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	160 static void
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	161 w_PyLong(const PyLongObject ob, WFILE p)
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	162 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	163 Py_ssize_t i, j, n, l;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	164 digit d;
52215 bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	165
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	166 w_byte(TYPE_LONG, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	167 if (Py_SIZE(ob) == 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	168 w_long((long)0, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	169 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	170 }
52215 bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	171
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	172 /* set l to number of base PyLong_MARSHAL_BASE digits */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	173 n = ABS(Py_SIZE(ob));
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	174 l = (n-1) * PyLong_MARSHAL_RATIO;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	175 d = ob->ob_digit[n-1];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	176 assert(d != 0); /* a PyLong is always normalized */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	177 do {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	178 d >>= PyLong_MARSHAL_SHIFT;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	179 l++;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	180 } while (d != 0);
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	181 if (l > SIZE32_MAX) {
e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	182 p->depth--;
e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	183 p->error = WFERR_UNMARSHALLABLE;
e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	184 return;
e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	185 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	186 w_long((long)(Py_SIZE(ob) > 0 ? l : -l), p);
52215 bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	187
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	188 for (i=0; i < n-1; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	189 d = ob->ob_digit[i];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	190 for (j=0; j < PyLong_MARSHAL_RATIO; j++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	191 w_short(d & PyLong_MARSHAL_MASK, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	192 d >>= PyLong_MARSHAL_SHIFT;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	193 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	194 assert (d == 0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	195 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	196 d = ob->ob_digit[n-1];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	197 do {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	198 w_short(d & PyLong_MARSHAL_MASK, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	199 d >>= PyLong_MARSHAL_SHIFT;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	200 } while (d != 0);
52215 bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	201 }
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	202
4592 3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	203 static void
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	204 w_object(PyObject v, WFILE p)
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	205 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	206 Py_ssize_t i, n;
13070 7392e71f6cce Michael Hudson <mwh21@cam.ac.uk>: Fred Drake <fdrake@acm.org> parents: 12576 diff changeset	207
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	208 p->depth++;
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	209
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	210 if (p->depth > MAX_MARSHAL_STACK_DEPTH) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	211 p->error = WFERR_NESTEDTOODEEP;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	212 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	213 else if (v == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	214 w_byte(TYPE_NULL, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	215 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	216 else if (v == Py_None) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	217 w_byte(TYPE_NONE, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	218 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	219 else if (v == PyExc_StopIteration) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	220 w_byte(TYPE_STOPITER, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	221 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	222 else if (v == Py_Ellipsis) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	223 w_byte(TYPE_ELLIPSIS, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	224 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	225 else if (v == Py_False) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	226 w_byte(TYPE_FALSE, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	227 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	228 else if (v == Py_True) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	229 w_byte(TYPE_TRUE, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	230 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	231 else if (PyLong_CheckExact(v)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	232 long x = PyLong_AsLong(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	233 if ((x == -1) && PyErr_Occurred()) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	234 PyLongObject ob = (PyLongObject )v;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	235 PyErr_Clear();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	236 w_PyLong(ob, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	237 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	238 else {
4656 186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	239 #if SIZEOF_LONG > 4
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	240 long y = Py_ARITHMETIC_RIGHT_SHIFT(long, x, 31);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	241 if (y && y != -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	242 w_byte(TYPE_INT64, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	243 w_long64(x, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	244 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	245 else
4656 186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	246 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	247 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	248 w_byte(TYPE_INT, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	249 w_long(x, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	250 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	251 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	252 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	253 else if (PyFloat_CheckExact(v)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	254 if (p->version > 1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	255 unsigned char buf[8];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	256 if (_PyFloat_Pack8(PyFloat_AsDouble(v),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	257 buf, 1) < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	258 p->error = WFERR_UNMARSHALLABLE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	259 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	260 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	261 w_byte(TYPE_BINARY_FLOAT, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	262 w_string((char*)buf, 8, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	263 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	264 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	265 char *buf = PyOS_double_to_string(PyFloat_AS_DOUBLE(v),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	266 'g', 17, 0, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	267 if (!buf) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	268 p->error = WFERR_NOMEMORY;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	269 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	270 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	271 n = strlen(buf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	272 w_byte(TYPE_FLOAT, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	273 w_byte((int)n, p);
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	274 w_string(buf, n, p);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	275 PyMem_Free(buf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	276 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	277 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	278 else if (PyComplex_CheckExact(v)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	279 if (p->version > 1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	280 unsigned char buf[8];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	281 if (_PyFloat_Pack8(PyComplex_RealAsDouble(v),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	282 buf, 1) < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	283 p->error = WFERR_UNMARSHALLABLE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	284 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	285 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	286 w_byte(TYPE_BINARY_COMPLEX, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	287 w_string((char*)buf, 8, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	288 if (_PyFloat_Pack8(PyComplex_ImagAsDouble(v),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	289 buf, 1) < 0) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	290 p->error = WFERR_UNMARSHALLABLE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	291 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	292 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	293 w_string((char*)buf, 8, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	294 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	295 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	296 char *buf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	297 w_byte(TYPE_COMPLEX, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	298 buf = PyOS_double_to_string(PyComplex_RealAsDouble(v),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	299 'g', 17, 0, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	300 if (!buf) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	301 p->error = WFERR_NOMEMORY;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	302 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	303 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	304 n = strlen(buf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	305 w_byte((int)n, p);
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	306 w_string(buf, n, p);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	307 PyMem_Free(buf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	308 buf = PyOS_double_to_string(PyComplex_ImagAsDouble(v),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	309 'g', 17, 0, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	310 if (!buf) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	311 p->error = WFERR_NOMEMORY;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	312 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	313 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	314 n = strlen(buf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	315 w_byte((int)n, p);
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	316 w_string(buf, n, p);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	317 PyMem_Free(buf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	318 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	319 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	320 else if (PyBytes_CheckExact(v)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	321 w_byte(TYPE_STRING, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	322 n = PyBytes_GET_SIZE(v);
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	323 W_SIZE(n, p);
e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	324 w_string(PyBytes_AS_STRING(v), n, p);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	325 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	326 else if (PyUnicode_CheckExact(v)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	327 PyObject *utf8;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	328 utf8 = PyUnicode_EncodeUTF8(PyUnicode_AS_UNICODE(v),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	329 PyUnicode_GET_SIZE(v),
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	330 "surrogatepass");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	331 if (utf8 == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	332 p->depth--;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	333 p->error = WFERR_UNMARSHALLABLE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	334 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	335 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	336 w_byte(TYPE_UNICODE, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	337 n = PyBytes_GET_SIZE(utf8);
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	338 W_SIZE(n, p);
e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	339 w_string(PyBytes_AS_STRING(utf8), n, p);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	340 Py_DECREF(utf8);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	341 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	342 else if (PyTuple_CheckExact(v)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	343 w_byte(TYPE_TUPLE, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	344 n = PyTuple_Size(v);
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	345 W_SIZE(n, p);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	346 for (i = 0; i < n; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	347 w_object(PyTuple_GET_ITEM(v, i), p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	348 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	349 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	350 else if (PyList_CheckExact(v)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	351 w_byte(TYPE_LIST, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	352 n = PyList_GET_SIZE(v);
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	353 W_SIZE(n, p);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	354 for (i = 0; i < n; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	355 w_object(PyList_GET_ITEM(v, i), p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	356 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	357 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	358 else if (PyDict_CheckExact(v)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	359 Py_ssize_t pos;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	360 PyObject key, value;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	361 w_byte(TYPE_DICT, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	362 /* This one is NULL object terminated! */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	363 pos = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	364 while (PyDict_Next(v, &pos, &key, &value)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	365 w_object(key, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	366 w_object(value, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	367 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	368 w_object((PyObject *)NULL, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	369 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	370 else if (PyAnySet_CheckExact(v)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	371 PyObject value, it;
34394 b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	372
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	373 if (PyObject_TypeCheck(v, &PySet_Type))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	374 w_byte(TYPE_SET, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	375 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	376 w_byte(TYPE_FROZENSET, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	377 n = PyObject_Size(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	378 if (n == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	379 p->depth--;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	380 p->error = WFERR_UNMARSHALLABLE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	381 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	382 }
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	383 W_SIZE(n, p);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	384 it = PyObject_GetIter(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	385 if (it == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	386 p->depth--;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	387 p->error = WFERR_UNMARSHALLABLE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	388 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	389 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	390 while ((value = PyIter_Next(it)) != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	391 w_object(value, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	392 Py_DECREF(value);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	393 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	394 Py_DECREF(it);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	395 if (PyErr_Occurred()) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	396 p->depth--;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	397 p->error = WFERR_UNMARSHALLABLE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	398 return;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	399 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	400 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	401 else if (PyCode_Check(v)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	402 PyCodeObject co = (PyCodeObject )v;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	403 w_byte(TYPE_CODE, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	404 w_long(co->co_argcount, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	405 w_long(co->co_kwonlyargcount, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	406 w_long(co->co_nlocals, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	407 w_long(co->co_stacksize, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	408 w_long(co->co_flags, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	409 w_object(co->co_code, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	410 w_object(co->co_consts, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	411 w_object(co->co_names, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	412 w_object(co->co_varnames, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	413 w_object(co->co_freevars, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	414 w_object(co->co_cellvars, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	415 w_object(co->co_filename, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	416 w_object(co->co_name, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	417 w_long(co->co_firstlineno, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	418 w_object(co->co_lnotab, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	419 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	420 else if (PyObject_CheckBuffer(v)) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	421 /* Write unknown buffer-style objects as a string */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	422 char *s;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	423 Py_buffer view;
75369 185a6ae76479 Issue #14172: Fix reference leak when marshalling a buffer-like object (other than a bytes object). Antoine Pitrou <solipsis@pitrou.net> parents: 71554 diff changeset	424 if (PyObject_GetBuffer(v, &view, PyBUF_SIMPLE) != 0) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	425 w_byte(TYPE_UNKNOWN, p);
75369 185a6ae76479 Issue #14172: Fix reference leak when marshalling a buffer-like object (other than a bytes object). Antoine Pitrou <solipsis@pitrou.net> parents: 71554 diff changeset	426 p->depth--;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	427 p->error = WFERR_UNMARSHALLABLE;
75369 185a6ae76479 Issue #14172: Fix reference leak when marshalling a buffer-like object (other than a bytes object). Antoine Pitrou <solipsis@pitrou.net> parents: 71554 diff changeset	428 return;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	429 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	430 w_byte(TYPE_STRING, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	431 n = view.len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	432 s = view.buf;
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	433 W_SIZE(n, p);
e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	434 w_string(s, n, p);
75369 185a6ae76479 Issue #14172: Fix reference leak when marshalling a buffer-like object (other than a bytes object). Antoine Pitrou <solipsis@pitrou.net> parents: 71554 diff changeset	435 PyBuffer_Release(&view);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	436 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	437 else {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	438 w_byte(TYPE_UNKNOWN, p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	439 p->error = WFERR_UNMARSHALLABLE;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	440 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	441 p->depth--;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	442 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	443
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	444 /* version currently has no effect for writing longs. */
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	445 void
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	446 PyMarshal_WriteLongToFile(long x, FILE *fp, int version)
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	447 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	448 WFILE wf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	449 wf.fp = fp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	450 wf.error = WFERR_OK;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	451 wf.depth = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	452 wf.strings = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	453 wf.version = version;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	454 w_long(x, &wf);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	455 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	456
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	457 void
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	458 PyMarshal_WriteObjectToFile(PyObject x, FILE fp, int version)
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	459 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	460 WFILE wf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	461 wf.fp = fp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	462 wf.error = WFERR_OK;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	463 wf.depth = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	464 wf.strings = (version > 0) ? PyDict_New() : NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	465 wf.version = version;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	466 w_object(x, &wf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	467 Py_XDECREF(wf.strings);
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	468 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	469
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	470 typedef WFILE RFILE; /* Same struct with different invariants */
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	471
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	472 #define rs_byte(p) (((p)->ptr < (p)->end) ? (unsigned char)*(p)->ptr++ : EOF)
2503 4dd1af0ddef0 various tuple related optimizations; remove unused b/w compat code from ceval.c Guido van Rossum <guido@python.org> parents: 2368 diff changeset	473
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	474 static Py_ssize_t
e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	475 r_string(char s, Py_ssize_t n, RFILE p)
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	476 {
71554 9e293f617544 Fix style in code added by edba722f3b02 Éric Araujo <merwok@netwok.org> parents: 71134 diff changeset	477 char *ptr;
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	478 Py_ssize_t read, left;
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	479
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	480 if (!p->readable) {
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	481 if (p->fp != NULL)
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	482 /* The result fits into int because it must be <=n. */
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	483 read = fread(s, 1, n, p->fp);
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	484 else {
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	485 left = p->end - p->ptr;
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	486 read = (left < n) ? left : n;
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	487 memcpy(s, p->ptr, read);
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	488 p->ptr += read;
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	489 }
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	490 }
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	491 else {
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	492 PyObject *data = PyObject_CallMethod(p->readable, "read", "n", n);
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	493 read = 0;
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	494 if (data != NULL) {
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	495 if (!PyBytes_Check(data)) {
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	496 PyErr_Format(PyExc_TypeError,
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	497 "f.read() returned not bytes but %.100s",
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	498 data->ob_type->tp_name);
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	499 }
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	500 else {
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	501 read = PyBytes_GET_SIZE(data);
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	502 if (read > 0) {
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	503 ptr = PyBytes_AS_STRING(data);
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	504 memcpy(s, ptr, read);
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	505 }
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	506 }
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	507 Py_DECREF(data);
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	508 }
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	509 }
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	510 if (!PyErr_Occurred() && (read < n)) {
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	511 PyErr_SetString(PyExc_EOFError, "EOF read where not expected");
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	512 }
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	513 return read;
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	514 }
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	515
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	516
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	517 static int
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	518 r_byte(RFILE *p)
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	519 {
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	520 int c = EOF;
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	521 unsigned char ch;
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	522 Py_ssize_t n;
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	523
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	524 if (!p->readable)
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	525 c = p->fp ? getc(p->fp) : rs_byte(p);
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	526 else {
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	527 n = r_string((char *) &ch, 1, p);
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	528 if (n > 0)
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	529 c = ch;
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	530 }
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	531 return c;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	532 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	533
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	534 static int
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	535 r_short(RFILE *p)
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	536 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	537 register short x;
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	538 unsigned char buffer[2];
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	539
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	540 r_string((char *) buffer, 2, p);
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	541 x = buffer[0];
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	542 x \|= buffer[1] << 8;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	543 /* Sign-extension, in case short greater than 16 bits */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	544 x \|= -(x & 0x8000);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	545 return x;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	546 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	547
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	548 static long
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	549 r_long(RFILE *p)
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	550 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	551 register long x;
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	552 unsigned char buffer[4];
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	553
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	554 r_string((char *) buffer, 4, p);
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	555 x = buffer[0];
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	556 x \|= (long)buffer[1] << 8;
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	557 x \|= (long)buffer[2] << 16;
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	558 x \|= (long)buffer[3] << 24;
4656 186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	559 #if SIZEOF_LONG > 4
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	560 /* Sign extension for 64-bit machines */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	561 x \|= -(x & 0x80000000L);
4656 186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	562 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	563 return x;
4592 3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	564 }
3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	565
19547 7e628f60245e marshal.c r_long64: When reading a TYPE_INT64 value on a box with 32-bit Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	566 /* r_long64 deals with the TYPE_INT64 code. On a machine with
7e628f60245e marshal.c r_long64: When reading a TYPE_INT64 value on a box with 32-bit Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	567 sizeof(long) > 4, it returns a Python int object, else a Python long
7e628f60245e marshal.c r_long64: When reading a TYPE_INT64 value on a box with 32-bit Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	568 object. Note that w_long64 writes out TYPE_INT if 32 bits is enough,
7e628f60245e marshal.c r_long64: When reading a TYPE_INT64 value on a box with 32-bit Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	569 so there's no inefficiency here in returning a PyLong on 32-bit boxes
7e628f60245e marshal.c r_long64: When reading a TYPE_INT64 value on a box with 32-bit Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	570 for everything written via TYPE_INT64 (i.e., if an int is written via
7e628f60245e marshal.c r_long64: When reading a TYPE_INT64 value on a box with 32-bit Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	571 TYPE_INT64, it needs more than 32 bits).
7e628f60245e marshal.c r_long64: When reading a TYPE_INT64 value on a box with 32-bit Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	572 */
7e628f60245e marshal.c r_long64: When reading a TYPE_INT64 value on a box with 32-bit Tim Peters <tim.peters@gmail.com> parents: 19343 diff changeset	573 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	574 r_long64(RFILE *p)
4592 3bf9e2beaf8c Tentative changes to make this work better on 64-bit machines. Guido van Rossum <guido@python.org> parents: 4503 diff changeset	575 {
71554 9e293f617544 Fix style in code added by edba722f3b02 Éric Araujo <merwok@netwok.org> parents: 71134 diff changeset	576 PyObject *result = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	577 long lo4 = r_long(p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	578 long hi4 = r_long(p);
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	579
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	580 if (!PyErr_Occurred()) {
4656 186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	581 #if SIZEOF_LONG > 4
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	582 long x = (hi4 << 32) \| (lo4 & 0xFFFFFFFFL);
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	583 result = PyLong_FromLong(x);
4656 186c2ad4abf3 Better way to handle 64-bit ints, keeping gcc -Wall happy. Guido van Rossum <guido@python.org> parents: 4592 diff changeset	584 #else
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	585 unsigned char buf[8];
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	586 int one = 1;
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	587 int is_little_endian = (int)(char)&one;
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	588 if (is_little_endian) {
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	589 memcpy(buf, &lo4, 4);
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	590 memcpy(buf+4, &hi4, 4);
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	591 }
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	592 else {
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	593 memcpy(buf, &hi4, 4);
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	594 memcpy(buf+4, &lo4, 4);
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	595 }
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	596 result = _PyLong_FromByteArray(buf, 8, is_little_endian, 1);
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	597 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	598 }
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	599 return result;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	600 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	601
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	602 static PyObject *
52215 bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	603 r_PyLong(RFILE *p)
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	604 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	605 PyLongObject *ob;
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	606 long n, size, i;
e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	607 int j, md, shorts_in_top_digit;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	608 digit d;
52215 bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	609
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	610 n = r_long(p);
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	611 if (PyErr_Occurred())
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	612 return NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	613 if (n == 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	614 return (PyObject *)_PyLong_New(0);
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	615 if (n < -SIZE32_MAX \|\| n > SIZE32_MAX) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	616 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	617 "bad marshal data (long size out of range)");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	618 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	619 }
52215 bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	620
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	621 size = 1 + (ABS(n) - 1) / PyLong_MARSHAL_RATIO;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	622 shorts_in_top_digit = 1 + (ABS(n) - 1) % PyLong_MARSHAL_RATIO;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	623 ob = _PyLong_New(size);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	624 if (ob == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	625 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	626 Py_SIZE(ob) = n > 0 ? size : -size;
52215 bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	627
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	628 for (i = 0; i < size-1; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	629 d = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	630 for (j=0; j < PyLong_MARSHAL_RATIO; j++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	631 md = r_short(p);
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	632 if (PyErr_Occurred())
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	633 break;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	634 if (md < 0 \|\| md > PyLong_MARSHAL_BASE)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	635 goto bad_digit;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	636 d += (digit)md << j*PyLong_MARSHAL_SHIFT;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	637 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	638 ob->ob_digit[i] = d;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	639 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	640 d = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	641 for (j=0; j < shorts_in_top_digit; j++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	642 md = r_short(p);
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	643 if (PyErr_Occurred())
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	644 break;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	645 if (md < 0 \|\| md > PyLong_MARSHAL_BASE)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	646 goto bad_digit;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	647 /* topmost marshal digit should be nonzero */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	648 if (md == 0 && j == shorts_in_top_digit - 1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	649 Py_DECREF(ob);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	650 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	651 "bad marshal data (unnormalized long data)");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	652 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	653 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	654 d += (digit)md << j*PyLong_MARSHAL_SHIFT;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	655 }
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	656 if (PyErr_Occurred()) {
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	657 Py_DECREF(ob);
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	658 return NULL;
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	659 }
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	660 /* top digit should be nonzero, else the resulting PyLong won't be
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	661 normalized */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	662 ob->ob_digit[size-1] = d;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	663 return (PyObject *)ob;
52215 bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	664 bad_digit:
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	665 Py_DECREF(ob);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	666 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	667 "bad marshal data (digit out of range in long)");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	668 return NULL;
52215 bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	669 }
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	670
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	671
bb5de24a343f Issue #4258: Make it possible to use 30-bit digits for PyLongs: Mark Dickinson <dickinsm@gmail.com> parents: 52171 diff changeset	672 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	673 r_object(RFILE *p)
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	674 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	675 /* NULL is a valid return value, it does not necessarily means that
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	676 an exception is set. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	677 PyObject v, v2;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	678 long i, n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	679 int type = r_byte(p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	680 PyObject *retval;
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	681
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	682 p->depth++;
41824 24b60622b944 Merged revisions 55407-55513 via svnmerge from Guido van Rossum <guido@python.org> parents: 41715 diff changeset	683
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	684 if (p->depth > MAX_MARSHAL_STACK_DEPTH) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	685 p->depth--;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	686 PyErr_SetString(PyExc_ValueError, "recursion limit exceeded");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	687 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	688 }
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	689
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	690 switch (type) {
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	691
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	692 case EOF:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	693 PyErr_SetString(PyExc_EOFError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	694 "EOF read where object expected");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	695 retval = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	696 break;
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	697
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	698 case TYPE_NULL:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	699 retval = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	700 break;
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	701
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	702 case TYPE_NONE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	703 Py_INCREF(Py_None);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	704 retval = Py_None;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	705 break;
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	706
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	707 case TYPE_STOPITER:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	708 Py_INCREF(PyExc_StopIteration);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	709 retval = PyExc_StopIteration;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	710 break;
18148 7bc473b2c654 Merging the gen-branch into the main line, at Guido's direction. Yay! Tim Peters <tim.peters@gmail.com> parents: 17707 diff changeset	711
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	712 case TYPE_ELLIPSIS:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	713 Py_INCREF(Py_Ellipsis);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	714 retval = Py_Ellipsis;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	715 break;
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	716
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	717 case TYPE_FALSE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	718 Py_INCREF(Py_False);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	719 retval = Py_False;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	720 break;
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22705 diff changeset	721
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	722 case TYPE_TRUE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	723 Py_INCREF(Py_True);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	724 retval = Py_True;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	725 break;
22785 aa8d59823add Add the 'bool' type and its values 'False' and 'True', as described in Guido van Rossum <guido@python.org> parents: 22705 diff changeset	726
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	727 case TYPE_INT:
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	728 n = r_long(p);
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	729 retval = PyErr_Occurred() ? NULL : PyLong_FromLong(n);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	730 break;
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	731
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	732 case TYPE_INT64:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	733 retval = r_long64(p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	734 break;
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	735
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	736 case TYPE_LONG:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	737 retval = r_PyLong(p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	738 break;
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	739
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	740 case TYPE_FLOAT:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	741 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	742 char buf[256];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	743 double dx;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	744 retval = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	745 n = r_byte(p);
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	746 if (n == EOF \|\| r_string(buf, n, p) != n) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	747 PyErr_SetString(PyExc_EOFError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	748 "EOF read where object expected");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	749 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	750 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	751 buf[n] = '\0';
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	752 dx = PyOS_string_to_double(buf, NULL, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	753 if (dx == -1.0 && PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	754 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	755 retval = PyFloat_FromDouble(dx);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	756 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	757 }
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	758
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	759 case TYPE_BINARY_FLOAT:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	760 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	761 unsigned char buf[8];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	762 double x;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	763 if (r_string((char*)buf, 8, p) != 8) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	764 PyErr_SetString(PyExc_EOFError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	765 "EOF read where object expected");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	766 retval = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	767 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	768 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	769 x = _PyFloat_Unpack8(buf, 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	770 if (x == -1.0 && PyErr_Occurred()) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	771 retval = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	772 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	773 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	774 retval = PyFloat_FromDouble(x);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	775 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	776 }
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	777
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	778 case TYPE_COMPLEX:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	779 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	780 char buf[256];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	781 Py_complex c;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	782 retval = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	783 n = r_byte(p);
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	784 if (n == EOF \|\| r_string(buf, n, p) != n) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	785 PyErr_SetString(PyExc_EOFError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	786 "EOF read where object expected");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	787 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	788 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	789 buf[n] = '\0';
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	790 c.real = PyOS_string_to_double(buf, NULL, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	791 if (c.real == -1.0 && PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	792 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	793 n = r_byte(p);
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	794 if (n == EOF \|\| r_string(buf, n, p) != n) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	795 PyErr_SetString(PyExc_EOFError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	796 "EOF read where object expected");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	797 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	798 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	799 buf[n] = '\0';
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	800 c.imag = PyOS_string_to_double(buf, NULL, NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	801 if (c.imag == -1.0 && PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	802 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	803 retval = PyComplex_FromCComplex(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	804 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	805 }
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	806
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	807 case TYPE_BINARY_COMPLEX:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	808 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	809 unsigned char buf[8];
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	810 Py_complex c;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	811 if (r_string((char*)buf, 8, p) != 8) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	812 PyErr_SetString(PyExc_EOFError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	813 "EOF read where object expected");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	814 retval = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	815 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	816 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	817 c.real = _PyFloat_Unpack8(buf, 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	818 if (c.real == -1.0 && PyErr_Occurred()) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	819 retval = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	820 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	821 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	822 if (r_string((char*)buf, 8, p) != 8) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	823 PyErr_SetString(PyExc_EOFError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	824 "EOF read where object expected");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	825 retval = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	826 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	827 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	828 c.imag = _PyFloat_Unpack8(buf, 1);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	829 if (c.imag == -1.0 && PyErr_Occurred()) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	830 retval = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	831 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	832 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	833 retval = PyComplex_FromCComplex(c);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	834 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	835 }
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	836
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	837 case TYPE_STRING:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	838 n = r_long(p);
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	839 if (PyErr_Occurred()) {
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	840 retval = NULL;
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	841 break;
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	842 }
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	843 if (n < 0 \|\| n > SIZE32_MAX) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	844 PyErr_SetString(PyExc_ValueError, "bad marshal data (string size out of range)");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	845 retval = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	846 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	847 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	848 v = PyBytes_FromStringAndSize((char *)NULL, n);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	849 if (v == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	850 retval = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	851 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	852 }
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	853 if (r_string(PyBytes_AS_STRING(v), n, p) != n) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	854 Py_DECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	855 PyErr_SetString(PyExc_EOFError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	856 "EOF read where object expected");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	857 retval = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	858 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	859 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	860 retval = v;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	861 break;
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	862
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	863 case TYPE_UNICODE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	864 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	865 char *buffer;
11976 513354d87a85 Marc-Andre Lemburg: support marshalling Unicode objects (code 'u'). Guido van Rossum <guido@python.org> parents: 9300 diff changeset	866
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	867 n = r_long(p);
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	868 if (PyErr_Occurred()) {
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	869 retval = NULL;
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	870 break;
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	871 }
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	872 if (n < 0 \|\| n > SIZE32_MAX) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	873 PyErr_SetString(PyExc_ValueError, "bad marshal data (unicode size out of range)");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	874 retval = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	875 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	876 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	877 buffer = PyMem_NEW(char, n);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	878 if (buffer == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	879 retval = PyErr_NoMemory();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	880 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	881 }
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	882 if (r_string(buffer, n, p) != n) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	883 PyMem_DEL(buffer);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	884 PyErr_SetString(PyExc_EOFError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	885 "EOF read where object expected");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	886 retval = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	887 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	888 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	889 v = PyUnicode_DecodeUTF8(buffer, n, "surrogatepass");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	890 PyMem_DEL(buffer);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	891 retval = v;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	892 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	893 }
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	894
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	895 case TYPE_TUPLE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	896 n = r_long(p);
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	897 if (PyErr_Occurred()) {
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	898 retval = NULL;
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	899 break;
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	900 }
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	901 if (n < 0 \|\| n > SIZE32_MAX) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	902 PyErr_SetString(PyExc_ValueError, "bad marshal data (tuple size out of range)");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	903 retval = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	904 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	905 }
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	906 v = PyTuple_New(n);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	907 if (v == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	908 retval = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	909 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	910 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	911 for (i = 0; i < n; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	912 v2 = r_object(p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	913 if ( v2 == NULL ) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	914 if (!PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	915 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	916 "NULL object in marshal data for tuple");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	917 Py_DECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	918 v = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	919 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	920 }
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	921 PyTuple_SET_ITEM(v, i, v2);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	922 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	923 retval = v;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	924 break;
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	925
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	926 case TYPE_LIST:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	927 n = r_long(p);
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	928 if (PyErr_Occurred()) {
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	929 retval = NULL;
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	930 break;
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	931 }
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	932 if (n < 0 \|\| n > SIZE32_MAX) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	933 PyErr_SetString(PyExc_ValueError, "bad marshal data (list size out of range)");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	934 retval = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	935 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	936 }
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	937 v = PyList_New(n);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	938 if (v == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	939 retval = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	940 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	941 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	942 for (i = 0; i < n; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	943 v2 = r_object(p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	944 if ( v2 == NULL ) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	945 if (!PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	946 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	947 "NULL object in marshal data for list");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	948 Py_DECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	949 v = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	950 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	951 }
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	952 PyList_SET_ITEM(v, i, v2);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	953 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	954 retval = v;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	955 break;
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	956
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	957 case TYPE_DICT:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	958 v = PyDict_New();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	959 if (v == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	960 retval = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	961 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	962 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	963 for (;;) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	964 PyObject key, val;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	965 key = r_object(p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	966 if (key == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	967 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	968 val = r_object(p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	969 if (val != NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	970 PyDict_SetItem(v, key, val);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	971 Py_DECREF(key);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	972 Py_XDECREF(val);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	973 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	974 if (PyErr_Occurred()) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	975 Py_DECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	976 v = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	977 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	978 retval = v;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	979 break;
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	980
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	981 case TYPE_SET:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	982 case TYPE_FROZENSET:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	983 n = r_long(p);
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	984 if (PyErr_Occurred()) {
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	985 retval = NULL;
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	986 break;
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	987 }
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	988 if (n < 0 \|\| n > SIZE32_MAX) {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	989 PyErr_SetString(PyExc_ValueError, "bad marshal data (set size out of range)");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	990 retval = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	991 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	992 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	993 v = (type == TYPE_SET) ? PySet_New(NULL) : PyFrozenSet_New(NULL);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	994 if (v == NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	995 retval = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	996 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	997 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	998 for (i = 0; i < n; i++) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	999 v2 = r_object(p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1000 if ( v2 == NULL ) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1001 if (!PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1002 PyErr_SetString(PyExc_TypeError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1003 "NULL object in marshal data for set");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1004 Py_DECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1005 v = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1006 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1007 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1008 if (PySet_Add(v, v2) == -1) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1009 Py_DECREF(v);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1010 Py_DECREF(v2);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1011 v = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1012 break;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1013 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1014 Py_DECREF(v2);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1015 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1016 retval = v;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1017 break;
34394 b480abaf1f6f SF 1098985: set objects cannot be marshalled Raymond Hettinger <python@rcn.com> parents: 34205 diff changeset	1018
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1019 case TYPE_CODE:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1020 {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1021 int argcount;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1022 int kwonlyargcount;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1023 int nlocals;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1024 int stacksize;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1025 int flags;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1026 PyObject *code = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1027 PyObject *consts = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1028 PyObject *names = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1029 PyObject *varnames = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1030 PyObject *freevars = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1031 PyObject *cellvars = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1032 PyObject *filename = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1033 PyObject *name = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1034 int firstlineno;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1035 PyObject *lnotab = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1036
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1037 v = NULL;
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	1038
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1039 /* XXX ignore long->int overflows for now */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1040 argcount = (int)r_long(p);
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1041 if (PyErr_Occurred())
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1042 goto code_error;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1043 kwonlyargcount = (int)r_long(p);
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1044 if (PyErr_Occurred())
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1045 goto code_error;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1046 nlocals = (int)r_long(p);
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1047 if (PyErr_Occurred())
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1048 goto code_error;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1049 stacksize = (int)r_long(p);
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1050 if (PyErr_Occurred())
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1051 goto code_error;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1052 flags = (int)r_long(p);
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1053 if (PyErr_Occurred())
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1054 goto code_error;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1055 code = r_object(p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1056 if (code == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1057 goto code_error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1058 consts = r_object(p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1059 if (consts == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1060 goto code_error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1061 names = r_object(p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1062 if (names == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1063 goto code_error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1064 varnames = r_object(p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1065 if (varnames == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1066 goto code_error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1067 freevars = r_object(p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1068 if (freevars == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1069 goto code_error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1070 cellvars = r_object(p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1071 if (cellvars == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1072 goto code_error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1073 filename = r_object(p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1074 if (filename == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1075 goto code_error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1076 name = r_object(p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1077 if (name == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1078 goto code_error;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1079 firstlineno = (int)r_long(p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1080 lnotab = r_object(p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1081 if (lnotab == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1082 goto code_error;
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	1083
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1084 v = (PyObject *) PyCode_New(
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1085 argcount, kwonlyargcount,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1086 nlocals, stacksize, flags,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1087 code, consts, names, varnames,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1088 freevars, cellvars, filename, name,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1089 firstlineno, lnotab);
35008 44e3f21f0525 This is my patch: Michael W. Hudson <mwh@python.net> parents: 34413 diff changeset	1090
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1091 code_error:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1092 Py_XDECREF(code);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1093 Py_XDECREF(consts);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1094 Py_XDECREF(names);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1095 Py_XDECREF(varnames);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1096 Py_XDECREF(freevars);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1097 Py_XDECREF(cellvars);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1098 Py_XDECREF(filename);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1099 Py_XDECREF(name);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1100 Py_XDECREF(lnotab);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1101 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1102 retval = v;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1103 break;
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	1104
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1105 default:
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1106 /* Bogus data got written, which isn't ideal.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1107 This will let you keep working and recover. */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1108 PyErr_SetString(PyExc_ValueError, "bad marshal data (unknown type code)");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1109 retval = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1110 break;
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	1111
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1112 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1113 p->depth--;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1114 return retval;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1115 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1116
32343 54b257e55f99 Make private function static Neal Norwitz <nnorwitz@gmail.com> parents: 32305 diff changeset	1117 static PyObject *
31824 331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	1118 read_object(RFILE *p)
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	1119 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1120 PyObject *v;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1121 if (PyErr_Occurred()) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1122 fprintf(stderr, "XXX readobject called with exception set\n");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1123 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1124 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1125 v = r_object(p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1126 if (v == NULL && !PyErr_Occurred())
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1127 PyErr_SetString(PyExc_TypeError, "NULL object in marshal data for object");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1128 return v;
31824 331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	1129 }
331de8b9d1ed Marshal clean-up (SF patch #873224) Armin Rigo <arigo@tunes.org> parents: 30311 diff changeset	1130
20552 65dd6157f999 SF patch #470393 (Jim Ahlstrom): Add missing marshal function Guido van Rossum <guido@python.org> parents: 19605 diff changeset	1131 int
65dd6157f999 SF patch #470393 (Jim Ahlstrom): Add missing marshal function Guido van Rossum <guido@python.org> parents: 19605 diff changeset	1132 PyMarshal_ReadShortFromFile(FILE *fp)
65dd6157f999 SF patch #470393 (Jim Ahlstrom): Add missing marshal function Guido van Rossum <guido@python.org> parents: 19605 diff changeset	1133 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1134 RFILE rf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1135 assert(fp);
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1136 rf.readable = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1137 rf.fp = fp;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1138 rf.strings = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1139 rf.end = rf.ptr = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1140 return r_short(&rf);
20552 65dd6157f999 SF patch #470393 (Jim Ahlstrom): Add missing marshal function Guido van Rossum <guido@python.org> parents: 19605 diff changeset	1141 }
65dd6157f999 SF patch #470393 (Jim Ahlstrom): Add missing marshal function Guido van Rossum <guido@python.org> parents: 19605 diff changeset	1142
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	1143 long
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	1144 PyMarshal_ReadLongFromFile(FILE *fp)
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	1145 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1146 RFILE rf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1147 rf.fp = fp;
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1148 rf.readable = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1149 rf.strings = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1150 rf.ptr = rf.end = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1151 return r_long(&rf);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	1152 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	1153
15979 a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	1154 #ifdef HAVE_FSTAT
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	1155 /* Return size of file in bytes; < 0 if unknown. */
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	1156 static off_t
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	1157 getfilesize(FILE *fp)
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	1158 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1159 struct stat st;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1160 if (fstat(fileno(fp), &st) != 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1161 return -1;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1162 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1163 return st.st_size;
15979 a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	1164 }
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	1165 #endif
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	1166
15979 a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	1167 /* If we can get the size of the file up-front, and it's reasonably small,
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	1168 * read it in one gulp and delegate to ...FromString() instead. Much quicker
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	1169 * than reading a byte at a time from file; speeds .pyc imports.
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	1170 * CAUTION: since this may read the entire remainder of the file, don't
8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	1171 * call it unless you know you're done with the file.
15979 a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	1172 */
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1173 PyObject *
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	1174 PyMarshal_ReadLastObjectFromFile(FILE *fp)
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	1175 {
60825 92a633a30acb Merged revisions 80325 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56594 diff changeset	1176 /* REASONABLE_FILE_LIMIT is by defn something big enough for Tkinter.pyc. */
15979 a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	1177 #define REASONABLE_FILE_LIMIT (1L << 18)
a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	1178 #ifdef HAVE_FSTAT
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1179 off_t filesize;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1180 filesize = getfilesize(fp);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60825 diff changeset	1181 if (filesize > 0 && filesize <= REASONABLE_FILE_LIMIT) {
cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60825 diff changeset	1182 char* pBuf = (char *)PyMem_MALLOC(filesize);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1183 if (pBuf != NULL) {
82190 e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	1184 size_t n = fread(pBuf, 1, (size_t)filesize, fp);
e0464fa28c85 Issue #5308: Raise ValueError when marshalling too large object (a sequence Serhiy Storchaka <storchaka@gmail.com> parents: 75374 diff changeset	1185 PyObject* v = PyMarshal_ReadObjectFromString(pBuf, n);
61466 cab14be0ada1 Recorded merge of revisions 81029 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 60825 diff changeset	1186 PyMem_FREE(pBuf);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1187 return v;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1188 }
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	1189
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1190 }
15979 a36a4932e399 Variant of SF patch 103252: Startup optimize: read .pyc as string, not with getc(). Tim Peters <tim.peters@gmail.com>* parents: 15408 diff changeset	1191 #endif
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1192 /* We don't have fstat, or we do but the file is larger than
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1193 * REASONABLE_FILE_LIMIT or malloc failed -- read a byte at a time.
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1194 */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1195 return PyMarshal_ReadObjectFromFile(fp);
16311 8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	1196
8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	1197 #undef REASONABLE_FILE_LIMIT
8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	1198 }
8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	1199
8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	1200 PyObject *
8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	1201 PyMarshal_ReadObjectFromFile(FILE *fp)
8c41f3861aad It's unclear whether PyMarshal_XXX() are part of the public or private API. Tim Peters <tim.peters@gmail.com> parents: 16257 diff changeset	1202 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1203 RFILE rf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1204 PyObject *result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1205 rf.fp = fp;
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1206 rf.readable = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1207 rf.strings = PyList_New(0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1208 rf.depth = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1209 rf.ptr = rf.end = NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1210 result = r_object(&rf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1211 Py_DECREF(rf.strings);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1212 return result;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	1213 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	1214
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1215 PyObject *
36501 7fdc639bc5b4 Merge ssize_t branch. Martin v. Löwis <martin@v.loewis.de> parents: 36324 diff changeset	1216 PyMarshal_ReadObjectFromString(char *str, Py_ssize_t len)
1270 14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1217 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1218 RFILE rf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1219 PyObject *result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1220 rf.fp = NULL;
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1221 rf.readable = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1222 rf.ptr = str;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1223 rf.end = str + len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1224 rf.strings = PyList_New(0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1225 rf.depth = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1226 result = r_object(&rf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1227 Py_DECREF(rf.strings);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1228 return result;
1270 14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1229 }
14369a5e6167 Support for frozen scripts; added -i option. Guido van Rossum <guido@python.org> parents: 1257 diff changeset	1230
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1231 PyObject *
32422 3df36e2e5ddc Patch #923098: Share interned strings in marshal. Martin v. Löwis <martin@v.loewis.de> parents: 32343 diff changeset	1232 PyMarshal_WriteObjectToString(PyObject *x, int version)
4039 23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	1233 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1234 WFILE wf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1235 PyObject *res = NULL;
41653 52533370f1ad Make test_marshal pass. Not my best work. :-( Guido van Rossum <guido@python.org> parents: 41595 diff changeset	1236
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1237 wf.fp = NULL;
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1238 wf.readable = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1239 wf.str = PyBytes_FromStringAndSize((char *)NULL, 50);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1240 if (wf.str == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1241 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1242 wf.ptr = PyBytes_AS_STRING((PyBytesObject *)wf.str);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1243 wf.end = wf.ptr + PyBytes_Size(wf.str);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1244 wf.error = WFERR_OK;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1245 wf.depth = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1246 wf.version = version;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1247 wf.strings = (version > 0) ? PyDict_New() : NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1248 w_object(x, &wf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1249 Py_XDECREF(wf.strings);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1250 if (wf.str != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1251 char base = PyBytes_AS_STRING((PyBytesObject )wf.str);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1252 if (wf.ptr - base > PY_SSIZE_T_MAX) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1253 Py_DECREF(wf.str);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1254 PyErr_SetString(PyExc_OverflowError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1255 "too much marshal data for a string");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1256 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1257 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1258 if (_PyBytes_Resize(&wf.str, (Py_ssize_t)(wf.ptr - base)) < 0)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1259 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1260 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1261 if (wf.error != WFERR_OK) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1262 Py_XDECREF(wf.str);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1263 if (wf.error == WFERR_NOMEMORY)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1264 PyErr_NoMemory();
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1265 else
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1266 PyErr_SetString(PyExc_ValueError,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1267 (wf.error==WFERR_UNMARSHALLABLE)?"unmarshallable object"
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1268 :"object too deeply nested to marshal");
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1269 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1270 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1271 if (wf.str != NULL) {
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1272 /* XXX Quick hack -- need to do this differently */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1273 res = PyBytes_FromObject(wf.str);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1274 Py_DECREF(wf.str);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1275 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1276 return res;
4039 23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	1277 }
23f280ab5409 Added PyMarshal_WriteObjectToString() (moved the relevant code there Guido van Rossum <guido@python.org>* parents: 3839 diff changeset	1278
279 9c924f9c3b16 Add marshalling for dictionaries. Guido van Rossum <guido@python.org> parents: 272 diff changeset	1279 /* And an interface for Python programs... */
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1280
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1281 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	1282 marshal_dump(PyObject self, PyObject args)
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1283 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1284 /* XXX Quick hack -- need to do this differently */
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1285 PyObject *x;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1286 PyObject *f;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1287 int version = Py_MARSHAL_VERSION;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1288 PyObject *s;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1289 PyObject *res;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1290 if (!PyArg_ParseTuple(args, "OO\|i:dump", &x, &f, &version))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1291 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1292 s = PyMarshal_WriteObjectToString(x, version);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1293 if (s == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1294 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1295 res = PyObject_CallMethod(f, "write", "O", s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1296 Py_DECREF(s);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1297 return res;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1298 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1299
54035 19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1300 PyDoc_STRVAR(dump_doc,
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1301 "dump(value, file[, version])\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1302 \n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1303 Write the value on the open file. The value must be a supported type.\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1304 The file must be an open file object such as sys.stdout or returned by\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1305 open() or os.popen(). It must be opened in binary mode ('wb' or 'w+b').\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1306 \n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1307 If the value has (or contains an object that has) an unsupported type, a\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1308 ValueError exception is raised — but garbage data will also be written\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1309 to the file. The object will not be properly read back by load()\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1310 \n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1311 The version argument indicates the data format that dump should use.");
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1312
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1313 static PyObject *
38490 a5298f371be7 Convert more modules to METH_VARARGS. Georg Brandl <georg@python.org> parents: 36866 diff changeset	1314 marshal_load(PyObject self, PyObject f)
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1315 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1316 PyObject data, result;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1317 RFILE rf;
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1318
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1319 /*
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1320 * Make a call to the read method, but read zero bytes.
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1321 * This is to ensure that the object passed in at least
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1322 * has a read method which returns bytes.
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1323 */
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1324 data = PyObject_CallMethod(f, "read", "i", 0);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1325 if (data == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1326 return NULL;
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1327 if (!PyBytes_Check(data)) {
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1328 PyErr_Format(PyExc_TypeError,
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1329 "f.read() returned not bytes but %.100s",
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1330 data->ob_type->tp_name);
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1331 result = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1332 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1333 else {
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1334 rf.strings = PyList_New(0);
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1335 rf.depth = 0;
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1336 rf.fp = NULL;
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1337 rf.readable = f;
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1338 result = read_object(&rf);
edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1339 Py_DECREF(rf.strings);
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1340 }
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1341 Py_DECREF(data);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1342 return result;
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	1343 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	1344
54035 19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1345 PyDoc_STRVAR(load_doc,
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1346 "load(file)\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1347 \n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1348 Read one value from the open file and return it. If no valid value is\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1349 read (e.g. because the data has a different Python version’s\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1350 incompatible marshal format), raise EOFError, ValueError or TypeError.\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1351 The file must be an open file object opened in binary mode ('rb' or\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1352 'r+b').\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1353 \n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1354 Note: If an object containing an unsupported type was marshalled with\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1355 dump(), load() will substitute None for the unmarshallable type.");
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1356
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1357
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1358 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	1359 marshal_dumps(PyObject self, PyObject args)
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	1360 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1361 PyObject *x;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1362 int version = Py_MARSHAL_VERSION;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1363 if (!PyArg_ParseTuple(args, "O\|i:dumps", &x, &version))
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1364 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1365 return PyMarshal_WriteObjectToString(x, version);
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	1366 }
38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	1367
54035 19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1368 PyDoc_STRVAR(dumps_doc,
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1369 "dumps(value[, version])\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1370 \n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1371 Return the string that would be written to a file by dump(value, file).\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1372 The value must be a supported type. Raise a ValueError exception if\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1373 value has (or contains an object that has) an unsupported type.\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1374 \n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1375 The version argument indicates the data format that dumps should use.");
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1376
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1377
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1378 static PyObject *
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	1379 marshal_loads(PyObject self, PyObject args)
1191 38f0054f44a7 Added separate main program for the Mac: macmain.c Guido van Rossum <guido@python.org> parents: 795 diff changeset	1380 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1381 RFILE rf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1382 Py_buffer p;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1383 char *s;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1384 Py_ssize_t n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1385 PyObject* result;
75374 4966907d3661 Issue #14177: marshal.loads() now raises TypeError when given an unicode string. Antoine Pitrou <solipsis@pitrou.net> parents: 75369 diff changeset	1386 if (!PyArg_ParseTuple(args, "y*:loads", &p))
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1387 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1388 s = p.buf;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1389 n = p.len;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1390 rf.fp = NULL;
71131 edba722f3b02 Closes #12291: Fixed bug which was found when doing multiple loads from one stream. Vinay Sajip <vinay_sajip@yahoo.co.uk> parents: 68257 diff changeset	1391 rf.readable = NULL;
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1392 rf.ptr = s;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1393 rf.end = s + n;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1394 rf.strings = PyList_New(0);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1395 rf.depth = 0;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1396 result = read_object(&rf);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1397 Py_DECREF(rf.strings);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1398 PyBuffer_Release(&p);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1399 return result;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1400 }
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1401
54035 19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1402 PyDoc_STRVAR(loads_doc,
75374 4966907d3661 Issue #14177: marshal.loads() now raises TypeError when given an unicode string. Antoine Pitrou <solipsis@pitrou.net> parents: 75369 diff changeset	1403 "loads(bytes)\n\
54035 19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1404 \n\
75374 4966907d3661 Issue #14177: marshal.loads() now raises TypeError when given an unicode string. Antoine Pitrou <solipsis@pitrou.net> parents: 75369 diff changeset	1405 Convert the bytes object to a value. If no valid value is found, raise\n\
4966907d3661 Issue #14177: marshal.loads() now raises TypeError when given an unicode string. Antoine Pitrou <solipsis@pitrou.net> parents: 75369 diff changeset	1406 EOFError, ValueError or TypeError. Extra characters in the input are\n\
54035 19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1407 ignored.");
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1408
5373 5880384d7c71 Quickly renamed the remaining files -- this directory is done. Guido van Rossum <guido@python.org> parents: 5197 diff changeset	1409 static PyMethodDef marshal_methods[] = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1410 {"dump", marshal_dump, METH_VARARGS, dump_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1411 {"load", marshal_load, METH_O, load_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1412 {"dumps", marshal_dumps, METH_VARARGS, dumps_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1413 {"loads", marshal_loads, METH_VARARGS, loads_doc},
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1414 {NULL, NULL} /* sentinel */
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1415 };
457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1416
54035 19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1417
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1418 PyDoc_STRVAR(module_doc,
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1419 "This module contains functions that can read and write Python values in\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1420 a binary format. The format is specific to Python, but independent of\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1421 machine architecture issues.\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1422 \n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1423 Not all Python object types are supported; in general, only objects\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1424 whose value is independent from a particular invocation of Python can be\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1425 written and read by this module. The following types are supported:\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1426 None, integers, floating point numbers, strings, bytes, bytearrays,\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1427 tuples, lists, sets, dictionaries, and code objects, where it\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1428 should be understood that tuples, lists and dictionaries are only\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1429 supported as long as the values contained therein are themselves\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1430 supported; and recursive lists and dictionaries should not be written\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1431 (they will cause infinite loops).\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1432 \n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1433 Variables:\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1434 \n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1435 version -- indicates the format that the module uses. Version 0 is the\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1436 historical format, version 1 shares interned strings and version 2\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1437 uses a binary format for floating point numbers.\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1438 \n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1439 Functions:\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1440 \n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1441 dump() -- write value to a file\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1442 load() -- read value from a file\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1443 dumps() -- write value to a string\n\
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1444 loads() -- read value from a string");
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1445
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1446
19e959626109 Merged revisions 72597 via svnmerge from R. David Murray <rdmurray@bitdance.com> parents: 53965 diff changeset	1447
48370 bfaf14295794 Rename a variable to be more in line with the name of the module. Brett Cannon <bcannon@gmail.com> parents: 48321 diff changeset	1448 static struct PyModuleDef marshalmodule = {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1449 PyModuleDef_HEAD_INIT,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1450 "marshal",
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1451 module_doc,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1452 0,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1453 marshal_methods,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1454 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1455 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1456 NULL,
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1457 NULL
47580 94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47343 diff changeset	1458 };
94f64f11fdd0 Implement PEP 3121: new module initialization and finalization API. Martin v. Löwis <martin@v.loewis.de> parents: 47343 diff changeset	1459
30311 f003e48f562d Bug #794140: cygwin builds do not embed Jason Tishler <jason@tishler.net> parents: 24435 diff changeset	1460 PyMODINIT_FUNC
13658 f79434ee41fa Mass ANSIfication of function definitions. Doesn't cover all 'extern' Thomas Wouters <thomas@python.org> parents: 13447 diff changeset	1461 PyMarshal_Init(void)
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1462 {
61467 f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1463 PyObject *mod = PyModule_Create(&marshalmodule);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1464 if (mod == NULL)
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1465 return NULL;
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1466 PyModule_AddIntConstant(mod, "version", Py_MARSHAL_VERSION);
f197407bdba2 Recorded merge of revisions 81032 via svnmerge from Antoine Pitrou <solipsis@pitrou.net> parents: 56297 diff changeset	1467 return mod;
267 457661e47c7b Initial revision Guido van Rossum <guido@python.org> parents: diff changeset	1468 }

Mercurial > cpython-lru_cache-weakref

annotate Python/marshal.c @ 86913:8c9769b17171 3.2