diff options
| author | Jacob Kaplan-Moss <jacob@jacobian.org> | 2009-04-03 20:04:39 +0000 |
|---|---|---|
| committer | Jacob Kaplan-Moss <jacob@jacobian.org> | 2009-04-03 20:04:39 +0000 |
| commit | fbffc2e943eba73715d1564f437ca4ee028de9d3 (patch) | |
| tree | 5d72924502478b2f543020bc0addd1296b89f2e3 /django | |
| parent | 9907495b3c412ece76f5e5e4c4e5df12b93caf78 (diff) | |
[1.0.X] Fixed #10522: accept tuples in `generic_inlineformset_factor(exclude)`. Thanks, mk. Backport of r10375 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.0.X@10376 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django')
| -rw-r--r-- | django/contrib/contenttypes/generic.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/django/contrib/contenttypes/generic.py b/django/contrib/contenttypes/generic.py index 0be1de6e63..adc245bb75 100644 --- a/django/contrib/contenttypes/generic.py +++ b/django/contrib/contenttypes/generic.py @@ -355,6 +355,7 @@ def generic_inlineformset_factory(model, form=ModelForm, raise Exception("fk_name '%s' is not a ForeignKey to ContentType" % ct_field) fk_field = opts.get_field(fk_field) # let the exception propagate if exclude is not None: + exclude = list(exclude) exclude.extend([ct_field.name, fk_field.name]) else: exclude = [ct_field.name, fk_field.name] |