d0f7c86a20
dis(): Not all opcodes are printable anymore, so print the repr
...
of the opcode character instead (but stripping the quotes).
Added a proto 2 test section for the canonical recursive-tuple case.
Note that since pickle's save_tuple() takes different paths depending on
tuple length now, beefier tests are really needed (but not in pickletools);
the "short tuple" case tried here was actually broken yesterday, and it's
subtle stuff so needs to be tested.
2003-01-28 15:27:57 +00:00
1be3175992
Add a few comments. Change the way the protocol is checked (it must
...
be one of 0, 1 or 2).
I should note that the previous checkin also added NEWOBJ support to
the unpickler -- but there's nothing yet that generates this.
2003-01-28 15:19:53 +00:00
3a41c61dd4
Rename all variables 'object' to 'obj' to avoid conflicts with the
...
type 'object'. Also minor docstring tweakage, and rearranged a few
lines in save().
2003-01-28 15:10:22 +00:00
570283584a
Fix one disassembly output now that empty tuples are no longer
...
memoized in text mode. Fixed some variable names in the disassembler
doctest.
2003-01-28 15:09:10 +00:00
cbe2dbddda
Don't memoize the empty tuple in protocol 0.
2003-01-28 14:40:16 +00:00
4faea015f7
Update to the final version released as Expat 1.95.6 (maintaining
...
Martin's integration changes).
2003-01-28 06:42:40 +00:00
d97da80dd5
save_tuple(): So long as the charter is rewriting for clarity, the snaky
...
control flow had to be simplified.
2003-01-28 05:48:29 +00:00
ff57bff16e
save_tuple(): I believe the new code for TUPLE{1,2,3} in proto 2 was
...
incorrect for recursive tuples. Tried to repair; seems to work OK, but
there are no checked-in tests for this yet.
2003-01-28 05:34:53 +00:00
81098ac1c8
Comments.
2003-01-28 05:12:08 +00:00
fdc03462b3
Now that proto2 is defined, replaced XXX blocks with text about it.
...
Also moved the proto2 opcode descriptors into the sections they fit (like
TUPLE{1,2,3} in the group of tuple-building opcodes; etc).
2003-01-28 04:56:33 +00:00
7d97d31a1b
OK, this is really the last one tonight!
...
NEWFALSE and NEWTRUE.
2003-01-28 04:25:27 +00:00
025bc2fe6c
Shouldn't test short tuples with all items equal -- one potential bug
...
would be that the tuple is reversed on unpickling, and we should catch
that. :-)
Goodnight -- that's it for toniht!
2003-01-28 04:20:02 +00:00
44f0ea5f73
More protocol 2: TUPLE1, TUPLE2, TUPLE3.
...
Also moved the special case for empty tuples from save() to save_tuple().
2003-01-28 04:14:51 +00:00
9d32bb1708
Rename 'bin' arg to 'proto'. Keep the default at 0 lest the tests
...
change in meaning.
2003-01-28 03:51:53 +00:00
3b769835ca
save_inst(): Rewrote to have only one branch on self.bin. Also got rid
...
of my recent XXX comment, taking a (what appears to be vanishingly small)
chance and calling self.memoize() instead.
2003-01-28 03:51:36 +00:00
d6c9e63af9
First baby steps towards implementing protocol 2: PROTO, LONG1 and LONG4.
2003-01-28 03:49:52 +00:00
d95c2df3a9
Fixed odd whitespace after "if", which I believe I introduced long ago.
2003-01-28 03:41:54 +00:00
8fda7bc48d
save_int(): Fixed two new off-by-1 glitches.
2003-01-28 03:40:52 +00:00
e0b904232f
Add a comment explaining that struct.pack() beats marshal.dumps(), but
...
marshal.loads() beats struct.unpack()! Possibly because the latter
creates a one-tuple. :-(
2003-01-28 03:17:21 +00:00
5c938d00a1
Got rid of mdumps; I timed it, and struct.pack("<i", x) is more than
...
40% faster than marshal.dumps(x)[1:]! (That's not counting the
module attribute lookups, which can be avoided in either case.)
2003-01-28 03:03:08 +00:00
f558da0f90
save_tuple(): Minor rewriting, and added a comment about the subtlety
...
created by recursive tuples.
2003-01-28 02:09:55 +00:00
209ad95b00
load_appends(): replaced .append() loop with an .extend().
2003-01-28 01:44:45 +00:00
c23d18a955
Comments.
2003-01-28 01:41:51 +00:00
064567e41a
save_dict(): Untangled most of the bin-vs-not-bin logic. Also used
...
iteritems() instead of materializing a (possibly giant) list of the
items.
2003-01-28 01:34:43 +00:00
21c18f0bf5
save_list(): Rewrote, to untangle the proto 0 from the proto 1 cases.
...
The code is much easier to follow now, and I bet it's faster too.
2003-01-28 01:15:46 +00:00
22dc6f4f7a
save_list(): removed unused local "d".
2003-01-28 01:07:48 +00:00
58d7846e68
save_list(): removed unused local "memo".
2003-01-28 01:07:10 +00:00
bd1cdb9227
save_pers(): Switched the order of cases, to get rid of a "not", and to
...
make the bin-vs-not-bin order consistent with what other routines try to
do (they almost all handle the bin case first).
2003-01-28 01:03:10 +00:00
518df0dae4
Several routines appeared to inline the guts of memoize(), possibly for
...
some notion of low-level efficiency. Undid that, but left one routine
alone: save_inst() claims it has a reason for not using memoize().
I don't understand that comment, so added an XXX comment there.
2003-01-28 01:00:38 +00:00
b32a8317d7
save(): Fiddled the control flow to put the normal case where it
...
belongs. This is a much smaller change than it may appear: the bulk
of the function merely got unindented by one level.
2003-01-28 00:48:09 +00:00
c9d7c4a656
Added XXX about save()'s special-casing of tuples -- I don't get it.
2003-01-28 00:43:26 +00:00
22987e3cbd
save_bool(): simplified.
2003-01-28 00:26:14 +00:00
cbd0a32d09
Repaired grammar in new comment.
2003-01-28 00:24:43 +00:00
b377f8ac3e
clear_memo(): Repaired grammar in docstring.
2003-01-28 00:23:36 +00:00
e105478a0c
Added one-line comments to the proto 2 opcodes.
2003-01-28 00:22:12 +00:00
784a3f53a8
Use proper function name in exception messages
2003-01-28 00:20:41 +00:00
fdb8cfab08
Removed the new LONG2 opcode: it's extravagant. If LONG1 isn't enough,
...
then the embedded argument consumes at least 256 bytes. The difference
between a 3-byte prefix (LONG2 + 2 bytes) and a 5-byte prefix (LONG4 +
4 bytes) is at worst less than 1%. Note that binary strings and binary
Unicode strings also have only "size is 1 byte, or size is 4 bytes?"
flavors, and I expect for the same reason. The only place a 2-byte
thingie was used was in BININT2, where the 2 bytes make up the *entire*
embedded argument (and now EXT2 also does this); that's a large savings
over 4 bytes, because the total opcode+argument size is so small in
the BININT2/EXT2 case.
Removed the TAKEN_FROM_ARGUMENT "number of bytes" code, and bifurcated it
into TAKEN_FROM_ARGUMENT1 and TAKEN_FROM_ARGUMENT4. Now there's enough
info in ArgumentDescriptor objects to deduce the # of bytes consumed by
each opcode.
Rearranged the order in which proto2 opcodes are listed in pickle.py.
2003-01-28 00:13:19 +00:00
bdbe74183c
Documented the 2's-comp business for the new long opcodes.
2003-01-27 23:54:04 +00:00
5eed340267
Whitespace normalization.
2003-01-27 23:51:36 +00:00
217e571a19
decode_long(): Simplified the "is it negative?" test.
2003-01-27 23:51:11 +00:00
f29d3d6011
Begin the change from 'binary vs. text mode' to 'protocol 0, 1, 2'.
...
The protocol now defaults to 1. Protocol 2 is still unimplemented.
2003-01-27 22:47:53 +00:00
99d4abf8a2
Support socket timeout in SSL, by Geoff Talvola.
...
(SF patch #675750 , to fix SF bug #675552.)
2003-01-27 22:22:50 +00:00
5a2d8f5e9a
Begin documenting protocol 2.
2003-01-27 21:44:25 +00:00
bb38e306ae
Added some comments.
2003-01-27 21:25:41 +00:00
e46b73f5b3
memoize(): Reworded the docs to try to disentangle the Pickler's memo
...
dict from the Unpickler's memo (which is a different beast!).
2003-01-27 21:22:10 +00:00
bbf63cd05c
Using marshal functions to pack & unpack 1-byte ints is an obscure &
...
expensive way to spell chr() and ord().
2003-01-27 21:15:36 +00:00
22a449aacc
Added a brief comment to each pickle opcode declaration.
2003-01-27 20:16:36 +00:00
a72ded9bc8
Remove a stray quote.
2003-01-27 19:40:47 +00:00
1996e23054
Repaired comment.
2003-01-27 19:38:34 +00:00
d916cf4ec7
stringnl_noescape_pair(): changed the reader to separate the two
...
component strings by a blank instead of a period. Guido pointed
out that the component strings (at least the first one) can be
dotted already. find_class() is overridable too, so only God knows
all the possibilities that make sense to someone.
2003-01-27 19:01:47 +00:00
Tim Peters
Guido van Rossum
Fred Drake
Neal Norwitz