Stowage/msgpack-python
2
0
Fork 0
mirror of https://github.com/msgpack/msgpack-python.git synced 2025-10-25 14:44:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

Intern map keys (#381)

Browse source 
Fixes #372.
This commit is contained in:
Inada Naoki 2019-12-03 21:18:17 +09:00 • committed by GitHub
parent e419cd8e2d
commit 2c6668941f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
msgpack/fallback.py
View file

@ -644,6 +644,8 @@ class Unpacker(object):
key = self._unpack(EX_CONSTRUCT) key = self._unpack(EX_CONSTRUCT)
if self._strict_map_key and type(key) not in (unicode, bytes): if self._strict_map_key and type(key) not in (unicode, bytes):
raise ValueError("%s is not allowed for map key" % str(type(key))) raise ValueError("%s is not allowed for map key" % str(type(key)))
if not PY2 and type(key) is str:
key = sys.intern(key)
ret[key] = self._unpack(EX_CONSTRUCT) ret[key] = self._unpack(EX_CONSTRUCT)
if self._object_hook is not None: if self._object_hook is not None:
ret = self._object_hook(ret) ret = self._object_hook(ret)

3
msgpack/unpack.h
View file

@ -192,6 +192,9 @@ static inline int unpack_callback_map_item(unpack_user* u, unsigned int current,
PyErr_Format(PyExc_ValueError, "%.100s is not allowed for map key", Py_TYPE(k)->tp_name); PyErr_Format(PyExc_ValueError, "%.100s is not allowed for map key", Py_TYPE(k)->tp_name);
return -1; return -1;
} }
if (PyUnicode_CheckExact(k)) {
PyUnicode_InternInPlace(&k);
}
if (u->has_pairs_hook) { if (u->has_pairs_hook) {
msgpack_unpack_object item = PyTuple_Pack(2, k, v); msgpack_unpack_object item = PyTuple_Pack(2, k, v);
if (!item) if (!item)