diff options
| author | Ken Pepple <ken.pepple@gmail.com> | 2011-02-19 20:14:32 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-02-19 20:14:32 +0000 |
| commit | f522a31a797dd75cf3cc8fa6c25b63de149d109e (patch) | |
| tree | 878c7093a123155a7f060c8939a4bfd018b8047d /nova | |
| parent | c050c1fd6ceb20a74a3accdce8979a9b8756de6a (diff) | |
| parent | 89a63f53116b04a8d0681265ba8ce71eeeb5be0b (diff) | |
| download | nova-f522a31a797dd75cf3cc8fa6c25b63de149d109e.tar.gz nova-f522a31a797dd75cf3cc8fa6c25b63de149d109e.tar.xz nova-f522a31a797dd75cf3cc8fa6c25b63de149d109e.zip | |
added elif branch to handle the conversion of datetime instances to isoformat instead of plain string conversion
Diffstat (limited to 'nova')
| -rw-r--r-- | nova/api/ec2/apirequest.py | 3 | ||||
| -rw-r--r-- | nova/tests/api/openstack/test_zones.py | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/nova/api/ec2/apirequest.py b/nova/api/ec2/apirequest.py index 7e72d67fb..00b527d62 100644 --- a/nova/api/ec2/apirequest.py +++ b/nova/api/ec2/apirequest.py @@ -20,6 +20,7 @@ APIRequest class """ +import datetime import re # TODO(termie): replace minidom with etree from xml.dom import minidom @@ -171,6 +172,8 @@ class APIRequest(object): self._render_dict(xml, data_el, data.__dict__) elif isinstance(data, bool): data_el.appendChild(xml.createTextNode(str(data).lower())) + elif isinstance(data, datetime.datetime): + data_el.appendChild(xml.createTextNode(data.isoformat())) elif data != None: data_el.appendChild(xml.createTextNode(str(data))) diff --git a/nova/tests/api/openstack/test_zones.py b/nova/tests/api/openstack/test_zones.py index 5542a1cf3..df497ef1b 100644 --- a/nova/tests/api/openstack/test_zones.py +++ b/nova/tests/api/openstack/test_zones.py @@ -57,8 +57,7 @@ def zone_get_all(context): dict(id=1, api_url='http://foo.com', username='bob', password='xxx'), dict(id=2, api_url='http://blah.com', username='alice', - password='qwerty') - ] + password='qwerty')] class ZonesTest(unittest.TestCase): |