openstack/deb-python-wsme
Code Issues Proposed changes

Fixed nil date/time decoding from xml

Browse Source
This commit is contained in:
Christophe de Vienne
2012-04-19 13:36:28 +02:00
parent 561da5697d
commit 188d015e63
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
wsme/protocols/restxml.py
View File

@@ -180,11 +180,15 @@ def dict_fromxml(datatype, element):
@fromxml.when_object(datetime.date) @fromxml.when_object(datetime.date)
def date_fromxml(datatype, element): def date_fromxml(datatype, element):
if element.get('nil') == 'true':
return None
return datetime.datetime.strptime(element.text, '%Y-%m-%d').date() return datetime.datetime.strptime(element.text, '%Y-%m-%d').date()
@fromxml.when_object(datetime.time) @fromxml.when_object(datetime.time)
def time_fromxml(datatype, element): def time_fromxml(datatype, element):
if element.get('nil') == 'true':
return None
m = time_re.match(element.text) m = time_re.match(element.text)
if m: if m:
return datetime.time( return datetime.time(
@@ -195,6 +199,8 @@ def time_fromxml(datatype, element):
@fromxml.when_object(datetime.datetime) @fromxml.when_object(datetime.datetime)
def datetime_fromxml(datatype, element): def datetime_fromxml(datatype, element):
if element.get('nil') == 'true':
return None
return datetime.datetime.strptime(element.text, '%Y-%m-%dT%H:%M:%S') return datetime.datetime.strptime(element.text, '%Y-%m-%dT%H:%M:%S')