Commit d1a7436

aylen384dpgeorge

authored and

committed

unix-ffi/json: Accept both str and bytes as arg for json.loads().

Same as micropython's internal json lib does. Fixes #985. Signed-off-by: Dominik Heidler <dheidler@suse.de>

1 parent f72f3f1 commit d1a7436Copy full SHA for d1a7436

File tree

-2

lines changed

-2

lines changed

Lines changed: 4 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -354,8 +354,8 @@ def loads(`
`354`	`354`	`object_pairs_hook=None,`
`355`	`355`	`**kw`
`356`	`356`	`):`
`357`		- """Deserialize ``s`` (a ``str`` instance containing a JSON
`358`		`- document) to a Python object.`
	`357`	+ """Deserialize ``s`` (a ``str``, ``bytes`` or ``bytearray`` instance
	`358`	`+ containing a JSON document) to a Python object.`
`359`	`359`
`360`	`360`	``object_hook`` is an optional function that will be called with the
`361`	`361`	result of any object literal decode (a ``dict``). The return value of
`@@ -413,4 +413,6 @@ def loads(`
`413`	`413`	`kw["parse_int"] = parse_int`
`414`	`414`	`if parse_constant is not None:`
`415`	`415`	`kw["parse_constant"] = parse_constant`
	`416`	`+ if isinstance(s, (bytes, bytearray)):`
	`417`	`+ s = s.decode('utf-8')`
`416`	`418`	`return cls(**kw).decode(s)`

Comments

(0)