Skip to content

issue 674: remove DEFAULT_RECURSE_LIMIT and ValueError for signaling recursion limit #675

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
rsiemens wants to merge 1 commit into
base: main
Choose a base branch
from
+5 −10
Open

issue 674: remove DEFAULT_RECURSE_LIMIT and ValueError for signaling recursion limit #675

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions msgpack/fallback.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ def newlist_hint(size):
TYPE_BIN = 4
TYPE_EXT = 5

DEFAULT_RECURSE_LIMIT = 511


def _check_type_strict(obj, t, type=type, tuple=tuple):
if type(t) is tuple:
Expand Down Expand Up @@ -682,7 +680,6 @@ def __init__(
def _pack(
self,
obj,
nest_limit=DEFAULT_RECURSE_LIMIT,
check=isinstance,
check_type_strict=_check_type_strict,
):
Expand All @@ -693,8 +690,6 @@ def _pack(
else:
list_types = (list, tuple)
while True:
if nest_limit < 0:
raise ValueError("recursion limit exceeded")
if obj is None:
return self._buffer.write(b"\xc0")
if check(obj, bool):
Expand Down Expand Up @@ -783,10 +778,10 @@ def _pack(
n = len(obj)
self._pack_array_header(n)
for i in range(n):
self._pack(obj[i], nest_limit - 1)
self._pack(obj[i])
return
if check(obj, dict):
return self._pack_map_pairs(len(obj), obj.items(), nest_limit - 1)
return self._pack_map_pairs(len(obj), obj.items())

if self._datetime and check(obj, _DateTime) and obj.tzinfo is not None:
obj = Timestamp.from_datetime(obj)
Expand Down Expand Up @@ -886,11 +881,11 @@ def _pack_map_header(self, n):
return self._buffer.write(struct.pack(">BI", 0xDF, n))
raise ValueError("Dict is too large")

def _pack_map_pairs(self, n, pairs, nest_limit=DEFAULT_RECURSE_LIMIT):
def _pack_map_pairs(self, n, pairs):
self._pack_map_header(n)
for k, v in pairs:
self._pack(k, nest_limit - 1)
self._pack(v, nest_limit - 1)
self._pack(k)
self._pack(v)

def _pack_raw_header(self, n):
if n <= 0x1F:
Expand Down
Loading