x/wsme
Code Issues Proposed changes

Fix Python 3 compatibility

Browse Source 
--HG--
branch : empty_strings3
This commit is contained in:
Christophe de Vienne 2013-01-15 12:07:26 +01:00
parent 6ffa578b1b
commit 6b51ec0dd0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wsme/rest/xml.py
View File

@ -203,11 +203,11 @@ def dict_fromxml(datatype, element):
for item in element.findall('item'))) for item in element.findall('item')))
@fromxml.when_object(unicode) @fromxml.when_object(wsme.types.text)
def unicode_fromxml(datatype, element): def unicode_fromxml(datatype, element):
if element.get('nil') == 'true': if element.get('nil') == 'true':
return None return None
return datatype(element.text if element.text else '') return wsme.types.text(element.text) if element.text else six.u('')
@fromxml.when_object(datetime.date) @fromxml.when_object(datetime.date)

4
wsme/tests/test_restxml.py
View File

@ -100,8 +100,8 @@ def loadxml(el, datatype):
return parse_isotime(el.text) return parse_isotime(el.text)
if datatype == datetime.datetime: if datatype == datetime.datetime:
return parse_isodatetime(el.text) return parse_isodatetime(el.text)
if datatype == unicode: if datatype == wsme.types.text:
return datatype(el.text if el.text else '') return datatype(el.text if el.text else u(''))
if datatype == bool: if datatype == bool:
return el.text.lower() != 'false' return el.text.lower() != 'false'
if datatype is None: if datatype is None: