api: handle case where metadata is None

This fixes bug #1158808

Change-Id: Ib63f42417262544b12f3cdf267d3c2f2eb47746a
Signed-off-by: Julien Danjou <julien@danjou.info>
This commit is contained in:
Julien Danjou
2013-03-22 16:20:20 +01:00
parent d207bdb5b5
commit 5d01edce3f
2 changed files with 26 additions and 3 deletions

View File

@@ -194,9 +194,11 @@ def _flatten_metadata(metadata):
"""Return flattened resource metadata without nested structures
and with all values converted to unicode strings.
"""
return dict((k, unicode(v))
for k, v in metadata.iteritems()
if type(v) not in set([list, dict, set]))
if metadata:
return dict((k, unicode(v))
for k, v in metadata.iteritems()
if type(v) not in set([list, dict, set]))
return {}
class Sample(wtypes.Base):