1.1 --- a/imiptools/data.py Tue Mar 31 14:54:10 2015 +0200
1.2 +++ b/imiptools/data.py Tue Mar 31 17:35:39 2015 +0200
1.3 @@ -234,11 +234,11 @@
1.4 """
1.5
1.6 if d.has_key(name):
1.7 - values = d[name]
1.8 + items = d[name]
1.9 if all:
1.10 - return values
1.11 - elif len(values) == 1:
1.12 - return values[0]
1.13 + return items
1.14 + elif len(items) == 1:
1.15 + return items[0]
1.16 else:
1.17 return None
1.18 else:
1.19 @@ -261,13 +261,16 @@
1.20 else:
1.21 return {}
1.22
1.23 +def values_from_items(items):
1.24 + return map(lambda x: x[0], items)
1.25 +
1.26 def get_values(d, name, all=True):
1.27 if d.has_key(name):
1.28 - values = d[name]
1.29 - if not all and len(values) == 1:
1.30 - return values[0][0]
1.31 + items = d[name]
1.32 + if not all and len(items) == 1:
1.33 + return items[0][0]
1.34 else:
1.35 - return map(lambda x: x[0], values)
1.36 + return values_from_items(items)
1.37 else:
1.38 return None
1.39