8000 Fix error formatting (#463) · cantabular/msgpack-python@38357b9 · GitHub
[go: up one dir, main page]
Skip to content

Commit 38357b9

Browse files
hexagonrecursionhexagonrecursion
authored
Fix error formatting (msgpack#463)
1 parent 4b0819d commit 38357b9

File tree

1 file changed

+10
-6
lines changed

1 file changed

+10
-6
lines changed

‎msgpack/fallback.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -455,18 +455,20 @@ def _read_header(self):
455455
n = b & 0b00011111
456456
typ = TYPE_RAW
457457
if n > self._max_str_len:
458-
raise ValueError("%s exceeds max_str_len(%s)", n, self._max_str_len)
458+
raise ValueError("%s exceeds max_str_len(%s)" % (n, self._max_str_len))
459459
obj = self._read(n)
460460
elif b & 0b11110000 == 0b10010000:
461461
n = b & 0b00001111
462462
typ = TYPE_ARRAY
463463
if n > self._max_array_len:
464-
raise ValueError("%s exceeds max_array_len(%s)", n, self._max_array_len)
464+
raise ValueError(
465+
"%s exceeds max_array_len(%s)" % (n, self._max_array_len)
466+
)
465467
elif b & 0b11110000 == 0b10000000:
466468
n = b & 0b00001111
467469
typ = TYPE_MAP
468470
if n > self._max_map_len:
469-
raise ValueError("%s exceeds max_map_len(%s)", n, self._max_map_len)
471+
raise ValueError("%s exceeds max_map_len(%s)" % (n, self._max_map_len))
470472
elif b == 0xC0:
471473
obj = None
472474
elif b == 0xC2:
@@ -518,22 +520,24 @@ def _read_header(self):
518520
n = self._buffer[self._buff_i]
519521
self._buff_i += size
520522
if n > self._max_str_len:
521-
raise ValueError("%s exceeds max_str_len(%s)", n, self._max_str_len)
523+
raise ValueError("%s exceeds max_str_len(%s)" % (n, self._max_str_len))
522524
obj = self._read(n)
523525
elif 0xDC <= b <= 0xDD:
524526
size, fmt, typ = _MSGPACK_HEADERS[b]
525527
self._reserve(size)
526528
(n,) = _unpack_from(fmt, self._buffer, self._buff_i)
527529
self._buff_i += size
528530
if n > self._max_array_len:
529-
raise ValueError("%s exceeds max_array_len(%s)", n, self._max_array_len)
531+
raise ValueError(
532+
"%s exceeds max_array_len(%s)" % (n, self._max_array_len)
533+
)
530534
elif 0xDE <= b <= 0xDF:
531535
size, fmt, typ = _MSGPACK_HEADERS[b]
532536
self._reserve(size)
533537
(n,) = _unpack_from(fmt, self._buffer, self._buff_i)
534538
self._buff_i += size
535539
if n > self._max_map_len:
536-
raise ValueError("%s exceeds max_map_len(%s)", n, self._max_map_len)
540+
raise ValueError("%s exceeds max_map_len(%s)" % (n, self._max_map_len))
537541
else:
538542
raise FormatError("Unknown header: 0x%x" % b)
539543
return typ, n, obj

0 commit comments

Comments
 (0)
0