x/wsme
Code Issues Proposed changes

Fix unicode values read from json input on python 2.5

Browse Source
This commit is contained in:
Christophe de Vienne 2013-01-17 23:22:50 +01:00
parent a29633c846
commit c69d002acb
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
wsme/rest/json.py
View File

@ -164,6 +164,13 @@ def str_fromjson(datatype, value):
return value.encode('utf8') return value.encode('utf8')
@fromjson.when_object(wsme.types.text)
def text_fromjson(datatype, value):
if value is not None and isinstance(value, wsme.types.bytes):
return wsme.types.text(value)
return value
@fromjson.when_object(decimal.Decimal) @fromjson.when_object(decimal.Decimal)
def decimal_fromjson(datatype, value): def decimal_fromjson(datatype, value):
if value is None: if value is None: