[Python-checkins] CVS: python/dist/src/Lib pickle.py,1.46,1.47
Tim Peters
tim_one@users.sourceforge.net
Mon, 09 Apr 2001 19:48:55 -0700
Update of /cvsroot/python/python/dist/src/Lib
In directory usw-pr-cvs1:/tmp/cvs-serv15580/python/dist/src/Lib
Modified Files:
pickle.py
Log Message:
Mechanical fiddling for easier reading: every "if" test was enclosed in
parens, but no "while" test. Removed the former.
Index: pickle.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/pickle.py,v
retrieving revision 1.46
retrieving revision 1.47
diff -C2 -r1.46 -r1.47
*** pickle.py 2001/02/18 03:10:09 1.46
--- pickle.py 2001/04/10 02:48:53 1.47
***************
*** 111,117 ****
def put(self, i):
! if (self.bin):
s = mdumps(i)[1:]
! if (i < 256):
return BINPUT + s[0]
--- 111,117 ----
def put(self, i):
! if self.bin:
s = mdumps(i)[1:]
! if i < 256:
return BINPUT + s[0]
***************
*** 121,128 ****
def get(self, i):
! if (self.bin):
s = mdumps(i)[1:]
! if (i < 256):
return BINGET + s[0]
--- 121,128 ----
def get(self, i):
! if self.bin:
s = mdumps(i)[1:]
! if i < 256:
return BINGET + s[0]
***************
*** 134,140 ****
memo = self.memo
! if (not pers_save):
pid = self.persistent_id(object)
! if (pid is not None):
self.save_pers(pid)
return
--- 134,140 ----
memo = self.memo
! if not pers_save:
pid = self.persistent_id(object)
! if pid is not None:
self.save_pers(pid)
return
***************
*** 144,149 ****
t = type(object)
! if ((t is TupleType) and (len(object) == 0)):
! if (self.bin):
self.save_empty_tuple(object)
else:
--- 144,149 ----
t = type(object)
! if (t is TupleType) and (len(object) == 0):
! if self.bin:
self.save_empty_tuple(object)
else:
***************
*** 181,185 ****
return
! if (type(tup) is not TupleType):
raise PicklingError, "Value returned by %s must be a " \
"tuple" % reduce
--- 181,185 ----
return
! if type(tup) is not TupleType:
raise PicklingError, "Value returned by %s must be a " \
"tuple" % reduce
***************
*** 187,191 ****
l = len(tup)
! if ((l != 2) and (l != 3)):
raise PicklingError, "tuple returned by %s must contain " \
"only two or three elements" % reduce
--- 187,191 ----
l = len(tup)
! if (l != 2) and (l != 3):
raise PicklingError, "tuple returned by %s must contain " \
"only two or three elements" % reduce
***************
*** 194,198 ****
arg_tup = tup[1]
! if (l > 2):
state = tup[2]
else:
--- 194,198 ----
arg_tup = tup[1]
! if l > 2:
state = tup[2]
else:
***************
*** 218,222 ****
def save_pers(self, pid):
! if (not self.bin):
self.write(PERSID + str(pid) + '\n')
else:
--- 218,222 ----
def save_pers(self, pid):
! if not self.bin:
self.write(PERSID + str(pid) + '\n')
else:
***************
*** 232,236 ****
write(REDUCE)
! if (state is not None):
save(state)
write(BUILD)
--- 232,236 ----
write(REDUCE)
! if state is not None:
save(state)
write(BUILD)
***************
*** 243,250 ****
def save_int(self, object):
! if (self.bin):
i = mdumps(object)[1:]
! if (i[-2:] == '\000\000'):
! if (i[-3] == '\000'):
self.write(BININT1 + i[:-3])
return
--- 243,250 ----
def save_int(self, object):
! if self.bin:
i = mdumps(object)[1:]
! if i[-2:] == '\000\000':
! if i[-3] == '\000':
self.write(BININT1 + i[:-3])
return
***************
*** 273,280 ****
memo = self.memo
! if (self.bin):
l = len(object)
s = mdumps(l)[1:]
! if (l < 256):
self.write(SHORT_BINSTRING + s[0] + object)
else:
--- 273,280 ----
memo = self.memo
! if self.bin:
l = len(object)
s = mdumps(l)[1:]
! if l < 256:
self.write(SHORT_BINSTRING + s[0] + object)
else:
***************
*** 292,296 ****
memo = self.memo
! if (self.bin):
encoding = object.encode('utf-8')
l = len(encoding)
--- 292,296 ----
memo = self.memo
! if self.bin:
encoding = object.encode('utf-8')
l = len(encoding)
***************
*** 314,323 ****
unicode = object.isunicode()
! if (self.bin):
if unicode:
object = object.encode("utf-8")
l = len(object)
s = mdumps(l)[1:]
! if (l < 256 and not unicode):
self.write(SHORT_BINSTRING + s[0] + object)
else:
--- 314,323 ----
unicode = object.isunicode()
! if self.bin:
if unicode:
object = object.encode("utf-8")
l = len(object)
s = mdumps(l)[1:]
! if l < 256 and not unicode:
self.write(SHORT_BINSTRING + s[0] + object)
else:
***************
*** 353,358 ****
save(element)
! if (len(object) and memo.has_key(d)):
! if (self.bin):
write(POP_MARK + self.get(memo[d][0]))
return
--- 353,358 ----
save(element)
! if len(object) and memo.has_key(d):
! if self.bin:
write(POP_MARK + self.get(memo[d][0]))
return
***************
*** 376,380 ****
memo = self.memo
! if (self.bin):
write(EMPTY_LIST)
else:
--- 376,380 ----
memo = self.memo
! if self.bin:
write(EMPTY_LIST)
else:
***************
*** 387,391 ****
using_appends = (self.bin and (len(object) > 1))
! if (using_appends):
write(MARK)
--- 387,391 ----
using_appends = (self.bin and (len(object) > 1))
! if using_appends:
write(MARK)
***************
*** 393,400 ****
save(element)
! if (not using_appends):
write(APPEND)
! if (using_appends):
write(APPENDS)
dispatch[ListType] = save_list
--- 393,400 ----
save(element)
! if not using_appends:
write(APPEND)
! if using_appends:
write(APPENDS)
dispatch[ListType] = save_list
***************
*** 407,411 ****
memo = self.memo
! if (self.bin):
write(EMPTY_DICT)
else:
--- 407,411 ----
memo = self.memo
! if self.bin:
write(EMPTY_DICT)
else:
***************
*** 418,422 ****
using_setitems = (self.bin and (len(object) > 1))
! if (using_setitems):
write(MARK)
--- 418,422 ----
using_setitems = (self.bin and (len(object) > 1))
! if using_setitems:
write(MARK)
***************
*** 426,433 ****
save(value)
! if (not using_setitems):
write(SETITEM)
! if (using_setitems):
write(SETITEMS)
--- 426,433 ----
save(value)
! if not using_setitems:
write(SETITEM)
! if using_setitems:
write(SETITEMS)
***************
*** 453,457 ****
write(MARK)
! if (self.bin):
save(cls)
--- 453,457 ----
write(MARK)
! if self.bin:
save(cls)
***************
*** 460,464 ****
memo_len = len(memo)
! if (self.bin):
write(OBJ + self.put(memo_len))
else:
--- 460,464 ----
memo_len = len(memo)
! if self.bin:
write(OBJ + self.put(memo_len))
else:
***************
*** 483,487 ****
memo = self.memo
! if (name is None):
name = object.__name__
--- 483,487 ----
memo = self.memo
! if name is None:
name = object.__name__
***************
*** 800,804 ****
safe = None
! if (not safe):
raise UnpicklingError, "%s is not safe for " \
"unpickling" % callable
--- 800,804 ----
safe = None
! if not safe:
raise UnpicklingError, "%s is not safe for " \
"unpickling" % callable