From dfe76bd817b0d3efef4850124187bb2b4b82c051 Mon Sep 17 00:00:00 2001 From: Nick Gravgaard Date: Thu, 21 Aug 2014 16:33:24 +0100 Subject: [PATCH] Fixed bug in flat_merge() --- backdrop/core/nested_merge.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/backdrop/core/nested_merge.py b/backdrop/core/nested_merge.py index cc993fe5..6b4c12c0 100644 --- a/backdrop/core/nested_merge.py +++ b/backdrop/core/nested_merge.py @@ -30,11 +30,11 @@ def flat_merge(keys, collect, data): if not collect: return data - def apply_prefixes(record, keys): + def apply_prefixes(record, prefix_keys): # the prefix is a string like 'cabinet-office:desktop' - prefix = ':'.join([record[k] for k in group_by_keys if k in record]) + prefix = ':'.join([str(record[k]) for k in prefix_keys if k in record]) # we no longer need the items that went into the prefix - record = {k: v for k, v in record.items() if k not in group_by_keys} + record = {k: v for k, v in record.items() if k not in prefix_keys} for key, method in collect: old_key = collect_key(key, method) new_key = '{}:{}'.format(prefix, old_key)