Skip to content

fallback: match the C extension's strict_map_key error message #754

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
Vansh8803 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fallback: match the C extension's strict_map_key error message #754

Show file tree
Hide file tree
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
10 changes: 8 additions & 2 deletions msgpack/fallback.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -539,15 +539,21 @@ def _unpack(self, execute=EX_CONSTRUCT):
for _ in range(n):
key = self._unpack(EX_CONSTRUCT)
if self._strict_map_key and type(key) not in (str, bytes):
raise ValueError("%s is not allowed for map key" % str(type(key)))
raise ValueError(
"%s is not allowed for map key when strict_map_key=True"
% type(key).__name__
)
pairs.append((key, self._unpack(EX_CONSTRUCT)))
ret = self._object_pairs_hook(pairs)
else:
ret = {}
for _ in range(n):
key = self._unpack(EX_CONSTRUCT)
if self._strict_map_key and type(key) not in (str, bytes):
raise ValueError("%s is not allowed for map key" % str(type(key)))
raise ValueError(
"%s is not allowed for map key when strict_map_key=True"
% type(key).__name__
)
if isinstance(key, str):
key = sys.intern(key)
ret[key] = self._unpack(EX_CONSTRUCT)
Expand Down
8 changes: 8 additions & 0 deletions test/test_except.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,6 +147,14 @@ def test_strict_map_key():
unpackb(packed, raw=False, strict_map_key=True)


def test_strict_map_key_error_message():
# The pure-Python fallback should report the same message as the C
# extension when a map key has a disallowed type.
packed = packb({42: 1}, use_bin_type=True)
with raises(ValueError, match="int is not allowed for map key when strict_map_key=True"):
unpackb(packed, raw=False, strict_map_key=True)


def test_strict_map_key_with_object_pairs_hook():
# strict_map_key should be enforced even when object_pairs_hook is set
invalid = {42: "value"}
Expand Down
Loading