# HG changeset patch # User Paul Boddie # Date 1427816139 -7200 # Node ID 287659e8dc829f84c9043c00653bb146ad05e6f1 # Parent 81644290914bec64d7520a92590d14dac3462373 Added a values_from_items function and tidied up naming. diff -r 81644290914b -r 287659e8dc82 imiptools/data.py --- a/imiptools/data.py Tue Mar 31 14:54:10 2015 +0200 +++ b/imiptools/data.py Tue Mar 31 17:35:39 2015 +0200 @@ -234,11 +234,11 @@ """ if d.has_key(name): - values = d[name] + items = d[name] if all: - return values - elif len(values) == 1: - return values[0] + return items + elif len(items) == 1: + return items[0] else: return None else: @@ -261,13 +261,16 @@ else: return {} +def values_from_items(items): + return map(lambda x: x[0], items) + def get_values(d, name, all=True): if d.has_key(name): - values = d[name] - if not all and len(values) == 1: - return values[0][0] + items = d[name] + if not all and len(items) == 1: + return items[0][0] else: - return map(lambda x: x[0], values) + return values_from_items(items) else: return None