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

Remove encoding option from Unpacker. (#380)

Browse source
This commit is contained in:
Inada Naoki 2019-12-03 21:13:05 +09:00 • committed by GitHub
parent 83ebb63c44
commit e419cd8e2d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 51 deletions
Download patch file Download diff file Expand all files Collapse all files

5
msgpack/unpack.h
View file

@ -27,7 +27,6 @@ typedef struct unpack_user {
PyObject *object_hook;
PyObject *list_hook;
PyObject *ext_hook;
const char *encoding;
const char *unicode_errors;
Py_ssize_t max_str_len, max_bin_len, max_array_len, max_map_len, max_ext_len;
} unpack_user;
@ -232,9 +231,7 @@ static inline int unpack_callback_raw(unpack_user* u, const char* b, const char*
PyObject *py;
if (u->encoding) {
py = PyUnicode_Decode(p, l, u->encoding, u->unicode_errors);
} else if (u->raw) {
if (u->raw) {
py = PyBytes_FromStringAndSize(p, l);
} else {
py = PyUnicode_DecodeUTF8(p, l, u->unicode_errors);