diff options
| author | Thomas Goirand <thomas@goirand.fr> | 2013-05-12 05:32:34 +0000 |
|---|---|---|
| committer | Thomas Goirand <thomas@goirand.fr> | 2013-05-12 05:32:34 +0000 |
| commit | 28991f9514e3cd78a528bbbe956d9b4536c416e0 (patch) | |
| tree | a3871392d2382f60490824d79058f8a71ae1c34e /factory/utils.py | |
| parent | 57fa2e21aed37c1af2a87f36a998046b73092a21 (diff) | |
| parent | 876845102c4a217496d0f6435bfe1e3726d31fe4 (diff) | |
| download | factory-boy-28991f9514e3cd78a528bbbe956d9b4536c416e0.tar factory-boy-28991f9514e3cd78a528bbbe956d9b4536c416e0.tar.gz | |
Merge tag '2.0.2' into debian/unstable
Release of factory_boy 2.0.2
Conflicts:
docs/changelog.rst
docs/index.rst
docs/subfactory.rst
tests/cyclic/bar.py
tests/cyclic/foo.py
Diffstat (limited to 'factory/utils.py')
| -rw-r--r-- | factory/utils.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/factory/utils.py b/factory/utils.py index 2fcd7ff..f845f46 100644 --- a/factory/utils.py +++ b/factory/utils.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Copyright (c) 2010 Mark Sandstrom -# Copyright (c) 2011 Raphaël Barrois +# Copyright (c) 2011-2013 Raphaël Barrois # # Permission is hereby granted, free of charge, to any person obtaining a copy # of this software and associated documentation files (the "Software"), to deal @@ -43,7 +43,8 @@ def extract_dict(prefix, kwargs, pop=True, exclude=()): """ prefix = prefix + ATTR_SPLITTER extracted = {} - for key in kwargs.keys(): + + for key in list(kwargs): if key in exclude: continue |