djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

extmod/modujson: Support passing bytes/bytearray to json.loads.

Browse Source 
CPython allows this, and it can be useful to reduce the number of memory
allocations.

Fixes issue #5031.
This commit is contained in:
Damien George 2019-08-22 15:22:42 +10:00
parent 8e7745eb31
commit 2dfa69efbb
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
extmod/modujson.c
View File

@ -3,7 +3,7 @@
* *
* The MIT License (MIT) * The MIT License (MIT)
* *
* Copyright (c) 2014-2016 Damien P. George * Copyright (c) 2014-2019 Damien P. George
* *
* Permission is hereby granted, free of charge, to any person obtaining a copy * Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal * of this software and associated documentation files (the "Software"), to deal
@ -281,9 +281,9 @@ STATIC mp_obj_t mod_ujson_load(mp_obj_t stream_obj) {
STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_ujson_load_obj, mod_ujson_load); STATIC MP_DEFINE_CONST_FUN_OBJ_1(mod_ujson_load_obj, mod_ujson_load);
STATIC mp_obj_t mod_ujson_loads(mp_obj_t obj) { STATIC mp_obj_t mod_ujson_loads(mp_obj_t obj) {
size_t len; mp_buffer_info_t bufinfo;
const char *buf = mp_obj_str_get_data(obj, &len); mp_get_buffer_raise(obj, &bufinfo, MP_BUFFER_READ);
vstr_t vstr = {len, len, (char*)buf, true}; vstr_t vstr = {bufinfo.len, bufinfo.len, (char*)bufinfo.buf, true};
mp_obj_stringio_t sio = {{&mp_type_stringio}, &vstr, 0, MP_OBJ_NULL}; mp_obj_stringio_t sio = {{&mp_type_stringio}, &vstr, 0, MP_OBJ_NULL};
return mod_ujson_load(MP_OBJ_FROM_PTR(&sio)); return mod_ujson_load(MP_OBJ_FROM_PTR(&sio));
} }

4
tests/extmod/ujson_loads.py
View File

@ -37,6 +37,10 @@ my_print(json.loads('"abc\\uabcd"'))
# whitespace handling # whitespace handling
my_print(json.loads('{\n\t"a":[]\r\n, "b":[1], "c":{"3":4} \n\r\t\r\r\r\n}')) my_print(json.loads('{\n\t"a":[]\r\n, "b":[1], "c":{"3":4} \n\r\t\r\r\r\n}'))
# loading from bytes and bytearray
my_print(json.loads(b'[1,2]'))
my_print(json.loads(bytearray(b'[null]')))
# loading nothing should raise exception # loading nothing should raise exception
try: try:
json.loads('') json.loads('')