diff options
author | Raphaël Barrois <raphael.barrois@polytechnique.org> | 2012-07-10 12:19:44 -0700 |
---|---|---|
committer | Raphaël Barrois <raphael.barrois@polytechnique.org> | 2012-07-10 12:19:44 -0700 |
commit | efd66a93dd5234ac6d63f99c026029246a7b8bf3 (patch) | |
tree | 1cad45506f2a160f6b198144d9b9b481240f1670 /factory/utils.py | |
parent | c35e781466eb6c630e1321489927a4390401bb9c (diff) | |
parent | 65db1ac3c0e90bbe541caa1902314aa097f1997a (diff) | |
download | factory-boy-efd66a93dd5234ac6d63f99c026029246a7b8bf3.tar factory-boy-efd66a93dd5234ac6d63f99c026029246a7b8bf3.tar.gz |
Merge pull request #21 from msabramo/py3_try3
utils.multi_extract_dict: use key= argument to sorted instead of cmp=.
Diffstat (limited to 'factory/utils.py')
-rw-r--r-- | factory/utils.py | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/factory/utils.py b/factory/utils.py index 2fcd7ff..ce72a9a 100644 --- a/factory/utils.py +++ b/factory/utils.py @@ -57,16 +57,6 @@ def extract_dict(prefix, kwargs, pop=True, exclude=()): return extracted -def declength_compare(a, b): - """Compare objects, choosing longest first.""" - if len(a) > len(b): - return -1 - elif len(a) < len(b): - return 1 - else: - return cmp(a, b) - - def multi_extract_dict(prefixes, kwargs, pop=True, exclude=()): """Extracts all values from a given list of prefixes. @@ -78,7 +68,7 @@ def multi_extract_dict(prefixes, kwargs, pop=True, exclude=()): """ results = {} exclude = list(exclude) - for prefix in sorted(prefixes, cmp=declength_compare): + for prefix in sorted(prefixes, key=lambda x: -len(x)): extracted = extract_dict(prefix, kwargs, pop=pop, exclude=exclude) results[prefix] = extracted exclude.extend( |