From 184dd0516267c58370d6a88afb1c1ce894b2b7c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rapha=C3=ABl=20Barrois?= Date: Mon, 9 Apr 2012 13:31:13 +0200 Subject: Cleaner extract_dict: allow excluded keys. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Raphaël Barrois --- factory/utils.py | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'factory') diff --git a/factory/utils.py b/factory/utils.py index 6c6fd7d..2fcd7ff 100644 --- a/factory/utils.py +++ b/factory/utils.py @@ -25,7 +25,7 @@ #: (subfactory_name, subfactory_field) tuple. ATTR_SPLITTER = '__' -def extract_dict(prefix, kwargs, pop=True): +def extract_dict(prefix, kwargs, pop=True, exclude=()): """Extracts all values beginning with a given prefix from a dict. Can either 'pop' or 'get' them; @@ -34,6 +34,7 @@ def extract_dict(prefix, kwargs, pop=True): prefix (str): the prefix to use for lookups kwargs (dict): the dict from which values should be extracted pop (bool): whether to use pop (True) or get (False) + exclude (iterable): list of prefixed keys that shouldn't be extracted Returns: A new dict, containing values from kwargs and beginning with @@ -43,6 +44,9 @@ def extract_dict(prefix, kwargs, pop=True): prefix = prefix + ATTR_SPLITTER extracted = {} for key in kwargs.keys(): + if key in exclude: + continue + if key.startswith(prefix): new_key = key[len(prefix):] if pop: @@ -63,10 +67,21 @@ def declength_compare(a, b): return cmp(a, b) -def multi_extract_dict(prefixes, kwargs, pop=True): - """Extracts all values from a given list of prefixes.""" +def multi_extract_dict(prefixes, kwargs, pop=True, exclude=()): + """Extracts all values from a given list of prefixes. + + Arguments have the same meaning as for extract_dict. + + Returns: + dict(str => dict): a dict mapping each prefix to the dict of extracted + key/value. + """ results = {} + exclude = list(exclude) for prefix in sorted(prefixes, cmp=declength_compare): - extracted = extract_dict(prefix, kwargs, pop=pop) + extracted = extract_dict(prefix, kwargs, pop=pop, exclude=exclude) results[prefix] = extracted + exclude.extend( + ['%s%s%s' % (prefix, ATTR_SPLITTER, key) for key in extracted]) + return results -- cgit v1.2.3