Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit c32d824

Browse files
tim-onetim-one
committed
Mechanical fiddling for easier reading: every "if" test was enclosed in
parens, but no "while" test. Removed the former.
1 parent bfa18f7 commit c32d824

1 file changed

Lines changed: 35 additions & 35 deletions

File tree

‎Lib/pickle.py‎

Lines changed: 35 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -110,20 +110,20 @@ def dump(self, object):
110110
self.write(STOP)
111111

112112
def put(self, i):
113-
if (self.bin):
113+
if self.bin:
114114
s = mdumps(i)[1:]
115-
if (i < 256):
115+
if i < 256:
116116
return BINPUT + s[0]
117117

118118
return LONG_BINPUT + s
119119

120120
return PUT + `i` + '\n'
121121

122122
def get(self, i):
123-
if (self.bin):
123+
if self.bin:
124124
s = mdumps(i)[1:]
125125

126-
if (i < 256):
126+
if i < 256:
127127
return BINGET + s[0]
128128

129129
return LONG_BINGET + s
@@ -133,18 +133,18 @@ def get(self, i):
133133
def save(self, object, pers_save = 0):
134134
memo = self.memo
135135

136-
if (not pers_save):
136+
if not pers_save:
137137
pid = self.persistent_id(object)
138-
if (pid is not None):
138+
if pid is not None:
139139
self.save_pers(pid)
140140
return
141141

142142
d = id(object)
143143

144144
t = type(object)
145145

146-
if ((t is TupleType) and (len(object) == 0)):
147-
if (self.bin):
146+
if (t is TupleType) and (len(object) == 0):
147+
if self.bin:
148148
self.save_empty_tuple(object)
149149
else:
150150
self.save_tuple(object)
@@ -180,20 +180,20 @@ def save(self, object, pers_save = 0):
180180
self.save_global(object, tup)
181181
return
182182

183-
if (type(tup) is not TupleType):
183+
if type(tup) is not TupleType:
184184
raise PicklingError, "Value returned by %s must be a " \
185185
"tuple" % reduce
186186

187187
l = len(tup)
188188

189-
if ((l != 2) and (l != 3)):
189+
if (l != 2) and (l != 3):
190190
raise PicklingError, "tuple returned by %s must contain " \
191191
"only two or three elements" % reduce
192192

193193
callable = tup[0]
194194
arg_tup = tup[1]
195195

196-
if (l > 2):
196+
if l > 2:
197197
state = tup[2]
198198
else:
199199
state = None
@@ -217,7 +217,7 @@ def inst_persistent_id(self, object):
217217
return None
218218

219219
def save_pers(self, pid):
220-
if (not self.bin):
220+
if not self.bin:
221221
self.write(PERSID + str(pid) + '\n')
222222
else:
223223
self.save(pid, 1)
@@ -231,7 +231,7 @@ def save_reduce(self, callable, arg_tup, state = None):
231231
save(arg_tup)
232232
write(REDUCE)
233233

234-
if (state is not None):
234+
if state is not None:
235235
save(state)
236236
write(BUILD)
237237

@@ -242,10 +242,10 @@ def save_none(self, object):
242242
dispatch[NoneType] = save_none
243243

244244
def save_int(self, object):
245-
if (self.bin):
245+
if self.bin:
246246
i = mdumps(object)[1:]
247-
if (i[-2:] == '\000\000'):
248-
if (i[-3] == '\000'):
247+
if i[-2:] == '\000\000':
248+
if i[-3] == '\000':
249249
self.write(BININT1 + i[:-3])
250250
return
251251

@@ -272,10 +272,10 @@ def save_string(self, object):
272272
d = id(object)
273273
memo = self.memo
274274

275-
if (self.bin):
275+
if self.bin:
276276
l = len(object)
277277
s = mdumps(l)[1:]
278-
if (l < 256):
278+
if l < 256:
279279
self.write(SHORT_BINSTRING + s[0] + object)
280280
else:
281281
self.write(BINSTRING + s + object)
@@ -291,7 +291,7 @@ def save_unicode(self, object):
291291
d = id(object)
292292
memo = self.memo
293293

294-
if (self.bin):
294+
if self.bin:
295295
encoding = object.encode('utf-8')
296296
l = len(encoding)
297297
s = mdumps(l)[1:]
@@ -313,12 +313,12 @@ def save_string(self, object):
313313
memo = self.memo
314314
unicode = object.isunicode()
315315

316-
if (self.bin):
316+
if self.bin:
317317
if unicode:
318318
object = object.encode("utf-8")
319319
l = len(object)
320320
s = mdumps(l)[1:]
321-
if (l < 256 and not unicode):
321+
if l < 256 and not unicode:
322322
self.write(SHORT_BINSTRING + s[0] + object)
323323
else:
324324
if unicode:
@@ -352,8 +352,8 @@ def save_tuple(self, object):
352352
for element in object:
353353
save(element)
354354

355-
if (len(object) and memo.has_key(d)):
356-
if (self.bin):
355+
if len(object) and memo.has_key(d):
356+
if self.bin:
357357
write(POP_MARK + self.get(memo[d][0]))
358358
return
359359

@@ -375,7 +375,7 @@ def save_list(self, object):
375375
save = self.save
376376
memo = self.memo
377377

378-
if (self.bin):
378+
if self.bin:
379379
write(EMPTY_LIST)
380380
else:
381381
write(MARK + LIST)
@@ -386,16 +386,16 @@ def save_list(self, object):
386386

387387
using_appends = (self.bin and (len(object) > 1))
388388

389-
if (using_appends):
389+
if using_appends:
390390
write(MARK)
391391

392392
for element in object:
393393
save(element)
394394

395-
if (not using_appends):
395+
if not using_appends:
396396
write(APPEND)
397397

398-
if (using_appends):
398+
if using_appends:
399399
write(APPENDS)
400400
dispatch[ListType] = save_list
401401

@@ -406,7 +406,7 @@ def save_dict(self, object):
406406
save = self.save
407407
memo = self.memo
408408

409-
if (self.bin):
409+
if self.bin:
410410
write(EMPTY_DICT)
411411
else:
412412
write(MARK + DICT)
@@ -417,18 +417,18 @@ def save_dict(self, object):
417417

418418
using_setitems = (self.bin and (len(object) > 1))
419419

420-
if (using_setitems):
420+
if using_setitems:
421421
write(MARK)
422422

423423
items = object.items()
424424
for key, value in items:
425425
save(key)
426426
save(value)
427427

428-
if (not using_setitems):
428+
if not using_setitems:
429429
write(SETITEM)
430430

431-
if (using_setitems):
431+
if using_setitems:
432432
write(SETITEMS)
433433

434434
dispatch[DictionaryType] = save_dict
@@ -452,14 +452,14 @@ def save_inst(self, object):
452452

453453
write(MARK)
454454

455-
if (self.bin):
455+
if self.bin:
456456
save(cls)
457457

458458
for arg in args:
459459
save(arg)
460460

461461
memo_len = len(memo)
462-
if (self.bin):
462+
if self.bin:
463463
write(OBJ + self.put(memo_len))
464464
else:
465465
write(INST + cls.__module__ + '\n' + cls.__name__ + '\n' +
@@ -482,7 +482,7 @@ def save_global(self, object, name = None):
482482
write = self.write
483483
memo = self.memo
484484

485-
if (name is None):
485+
if name is None:
486486
name = object.__name__
487487

488488
try:
@@ -799,7 +799,7 @@ def load_reduce(self):
799799
except AttributeError:
800800
safe = None
801801

802-
if (not safe):
802+
if not safe:
803803
raise UnpicklingError, "%s is not safe for " \
804804
"unpickling" % callable
805805

0 commit comments

Comments
 (0)