Visitar URL original
Fix original patch. · msgpack/msgpack-python@2baaf7b · GitHub
Skip to content

Commit 2baaf7b

Browse files
devendordevendor
committed
Fix original patch.
1 parent 5ea4d26 commit 2baaf7b

1 file changed

Lines changed: 26 additions & 26 deletions

File tree

‎msgpack/fallback.py‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,7 @@ def __init__(self, file_like=None, read_size=0, use_list=True, raw=True,
231231
raise TypeError("`file_like.read` must be callable")
232232
self.file_like = file_like
233233
self._feeding = False
234-
# Some old pythons don't support `self.unpack_from()` `bytearray`.
234+
# Some old pythons don't support `self._unpack_from()` `bytearray`.
235235
if sys.version_info < (2, 7, 6):
236236
self._unpack_from = staticmethod(
237237
lambda f,b,o=0: struct.unpack_from(f, b[:o+2].tobytes(), o)
@@ -396,117 +396,117 @@ def _read_header(self, execute=EX_CONSTRUCT):
396396
elif b == 0xc5:
397397
typ = TYPE_BIN
398398
self._reserve(2)
399-
n = self.unpack_from(">H", self._buffer, self._buff_i)[0]
399+
n = self._unpack_from(">H", self._buffer, self._buff_i)[0]
400400
self._buff_i += 2
401401
if n > self._max_bin_len:
402402
raise UnpackValueError("%s exceeds max_bin_len(%s)" % (n, self._max_bin_len))
403403
obj = self._read(n)
404404
elif b == 0xc6:
405405
typ = TYPE_BIN
406406
self._reserve(4)
407-
n = self.unpack_from(">I", self._buffer, self._buff_i)[0]
407+
n = self._unpack_from(">I", self._buffer, self._buff_i)[0]
408408
self._buff_i += 4
409409
if n > self._max_bin_len:
410410
raise UnpackValueError("%s exceeds max_bin_len(%s)" % (n, self._max_bin_len))
411411
obj = self._read(n)
412412
elif b == 0xc7: # ext 8
413413
typ = TYPE_EXT
414414
self._reserve(2)
415-
L, n = self.unpack_from('Bb', self._buffer, self._buff_i)
415+
L, n = self._unpack_from('Bb', self._buffer, self._buff_i)
416416
self._buff_i += 2
417417
if L > self._max_ext_len:
418418
raise UnpackValueError("%s exceeds max_ext_len(%s)" % (L, self._max_ext_len))
419419
obj = self._read(L)
420420
elif b == 0xc8: # ext 16
421421
typ = TYPE_EXT
422422
self._reserve(3)
423-
L, n = self.unpack_from('>Hb', self._buffer, self._buff_i)
423+
L, n = self._unpack_from('>Hb', self._buffer, self._buff_i)
424424
self._buff_i += 3
425425
if L > self._max_ext_len:
426426
raise UnpackValueError("%s exceeds max_ext_len(%s)" % (L, self._max_ext_len))
427427
obj = self._read(L)
428428
elif b == 0xc9: # ext 32
429429
typ = TYPE_EXT
430430
self._reserve(5)
431-
L, n = self.unpack_from('>Ib', self._buffer, self._buff_i)
431+
L, n = self._unpack_from('>Ib', self._buffer, self._buff_i)
432432
self._buff_i += 5
433433
if L > self._max_ext_len:
434434
raise UnpackValueError("%s exceeds max_ext_len(%s)" % (L, self._max_ext_len))
435435
obj = self._read(L)
436436
elif b == 0xca:
437437
self._reserve(4)
438-
obj = self.unpack_from(">f", self._buffer, self._buff_i)[0]
438+
obj = self._unpack_from(">f", self._buffer, self._buff_i)[0]
439439
self._buff_i += 4
440440
elif b == 0xcb:
441441
self._reserve(8)
442-
obj = self.unpack_from(">d", self._buffer, self._buff_i)[0]
442+
obj = self._unpack_from(">d", self._buffer, self._buff_i)[0]
443443
self._buff_i += 8
444444
elif b == 0xcc:
445445
self._reserve(1)
446446
obj = self._buffer[self._buff_i]
447447
self._buff_i += 1
448448
elif b == 0xcd:
449449
self._reserve(2)
450-
obj = self.unpack_from(">H", self._buffer, self._buff_i)[0]
450+
obj = self._unpack_from(">H", self._buffer, self._buff_i)[0]
451451
self._buff_i += 2
452452
elif b == 0xce:
453453
self._reserve(4)
454-
obj = self.unpack_from(">I", self._buffer, self._buff_i)[0]
454+
obj = self._unpack_from(">I", self._buffer, self._buff_i)[0]
455455
self._buff_i += 4
456456
elif b == 0xcf:
457457
self._reserve(8)
458-
obj = self.unpack_from(">Q", self._buffer, self._buff_i)[0]
458+
obj = self._unpack_from(">Q", self._buffer, self._buff_i)[0]
459459
self._buff_i += 8
460460
elif b == 0xd0:
461461
self._reserve(1)
462-
obj = self.unpack_from("b", self._buffer, self._buff_i)[0]
462+
obj = self._unpack_from("b", self._buffer, self._buff_i)[0]
463463
self._buff_i += 1
464464
elif b == 0xd1:
465465
self._reserve(2)
466-
obj = self.unpack_from(">h", self._buffer, self._buff_i)[0]
466+
obj = self._unpack_from(">h", self._buffer, self._buff_i)[0]
467467
self._buff_i += 2
468468
elif b == 0xd2:
469469
self._reserve(4)
470-
obj = self.unpack_from(">i", self._buffer, self._buff_i)[0]
470+
obj = self._unpack_from(">i", self._buffer, self._buff_i)[0]
471471
self._buff_i += 4
472472
elif b == 0xd3:
473473
self._reserve(8)
474-
obj = self.unpack_from(">q", self._buffer, self._buff_i)[0]
474+
obj = self._unpack_from(">q", self._buffer, self._buff_i)[0]
475475
self._buff_i += 8
476476
elif b == 0xd4: # fixext 1
477477
typ = TYPE_EXT
478478
if self._max_ext_len < 1:
479479
raise UnpackValueError("%s exceeds max_ext_len(%s)" % (1, self._max_ext_len))
480480
self._reserve(2)
481-
n, obj = self.unpack_from("b1s", self._buffer, self._buff_i)
481+
n, obj = self._unpack_from("b1s", self._buffer, self._buff_i)
482482
self._buff_i += 2
483483
elif b == 0xd5: # fixext 2
484484
typ = TYPE_EXT
485485
if self._max_ext_len < 2:
486486
raise UnpackValueError("%s exceeds max_ext_len(%s)" % (2, self._max_ext_len))
487487
self._reserve(3)
488-
n, obj = self.unpack_from("b2s", self._buffer, self._buff_i)
488+
n, obj = self._unpack_from("b2s", self._buffer, self._buff_i)
489489
self._buff_i += 3
490490
elif b == 0xd6: # fixext 4
491491
typ = TYPE_EXT
492492
if self._max_ext_len < 4:
493493
raise UnpackValueError("%s exceeds max_ext_len(%s)" % (4, self._max_ext_len))
494494
self._reserve(5)
495-
n, obj = self.unpack_from("b4s", self._buffer, self._buff_i)
495+
n, obj = self._unpack_from("b4s", self._buffer, self._buff_i)
496496
self._buff_i += 5
497497
elif b == 0xd7: # fixext 8
498498
typ = TYPE_EXT
499499
if self._max_ext_len < 8:
500500
raise UnpackValueError("%s exceeds max_ext_len(%s)" % (8, self._max_ext_len))
501501
self._reserve(9)
502-
n, obj = self.unpack_from("b8s", self._buffer, self._buff_i)
502+
n, obj = self._unpack_from("b8s", self._buffer, self._buff_i)
503503
self._buff_i += 9
504504
elif b == 0xd8: # fixext 16
505505
typ = TYPE_EXT
506506
if self._max_ext_len < 16:
507507
raise UnpackValueError("%s exceeds max_ext_len(%s)" % (16, self._max_ext_len))
508508
self._reserve(17)
509-
n, obj = self.unpack_from("b16s", self._buffer, self._buff_i)
509+
n, obj = self._unpack_from("b16s", self._buffer, self._buff_i)
510510
self._buff_i += 17
511511
elif b == 0xd9:
512512
typ = TYPE_RAW
@@ -519,43 +519,43 @@ def _read_header(self, execute=EX_CONSTRUCT):
519519
elif b == 0xda:
520520
typ = TYPE_RAW
521521
self._reserve(2)
522-
n, = self.unpack_from(">H", self._buffer, self._buff_i)
522+
n, = self._unpack_from(">H", self._buffer, self._buff_i)
523523
self._buff_i += 2
524524
if n > self._max_str_len:
525525
raise UnpackValueError("%s exceeds max_str_len(%s)", n, self._max_str_len)
526526
obj = self._read(n)
527527
elif b == 0xdb:
528528
typ = TYPE_RAW
529529
self._reserve(4)
530-
n, = self.unpack_from(">I", self._buffer, self._buff_i)
530+
n, = self._unpack_from(">I", self._buffer, self._buff_i)
531531
self._buff_i += 4
532532
if n > self._max_str_len:
533533
raise UnpackValueError("%s exceeds max_str_len(%s)", n, self._max_str_len)
534534
obj = self._read(n)
535535
elif b == 0xdc:
536536
typ = TYPE_ARRAY
537537
self._reserve(2)
538-
n, = self.unpack_from(">H", self._buffer, self._buff_i)
538+
n, = self._unpack_from(">H", self._buffer, self._buff_i)
539539
self._buff_i += 2
540540
if n > self._max_array_len:
541541
raise UnpackValueError("%s exceeds max_array_len(%s)", n, self._max_array_len)
542542
elif b == 0xdd:
543543
typ = TYPE_ARRAY
544544
self._reserve(4)
545-
n, = self.unpack_from(">I", self._buffer, self._buff_i)
545+
n, = self._unpack_from(">I", self._buffer, self._buff_i)
546546
self._buff_i += 4
547547
if n > self._max_array_len:
548548
raise UnpackValueError("%s exceeds max_array_len(%s)", n, self._max_array_len)
549549
elif b == 0xde:
550550
self._reserve(2)
551-
n, = self.unpack_from(">H", self._buffer, self._buff_i)
551+
n, = self._unpack_from(">H", self._buffer, self._buff_i)
552552
self._buff_i += 2
553553
if n > self._max_map_len:
554554
raise UnpackValueError("%s exceeds max_map_len(%s)", n, self._max_map_len)
555555
typ = TYPE_MAP
556556
elif b == 0xdf:
557557
self._reserve(4)
558-
n, = self.unpack_from(">I", self._buffer, self._buff_i)
558+
n, = self._unpack_from(">I", self._buffer, self._buff_i)
559559
self._buff_i += 4
560560
if n > self._max_map_len:
561561
raise UnpackValueError("%s exceeds max_map_len(%s)", n, self._max_map_len)

0 commit comments

Comments
 (0)