Changeset 9086

Timestamp:

09/27/08 00:57:10 (3 months ago)

Author:

mtredinnick

Message:

Fixed #9171 -- Fixed a few places where we were assuming lists instead of
generic sequences in ModelForm? structures. Patch from mrmachine.

Files:

• django/trunk/django/contrib/admin/options.py (modified) (2 diffs)
• django/trunk/django/forms/models.py (modified) (1 diff)
• django/trunk/tests/regressiontests/inline_formsets/models.py (modified) (1 diff)
• django/trunk/tests/regressiontests/modeladmin/models.py (modified) (1 diff)

django/trunk/django/contrib/admin/options.py

@@ -267 +267 @@
-            exclude = []
-        else:
-self.exclude
+list(self.exclude)
-        defaults = {
-            "form": self.form,
@@ -781 +781 @@
-            exclude = []
-        else:
-self.exclude
+list(self.exclude)
-        defaults = {
-            "form": self.form,

django/trunk/django/forms/models.py

@@ -529 +529 @@
-        max_num = 1
-    if exclude is not None:
+        exclude = list(exclude)
-        exclude.append(fk.name)
-    else:

django/trunk/tests/regressiontests/inline_formsets/models.py

@@ -52 +52 @@
-
-
+# Regression test for #9171.
+>>> ifs = inlineformset_factory(Parent, Child, exclude=('school',), fk_name='mother')
-"""
-}

django/trunk/tests/regressiontests/modeladmin/models.py

@@ -124 +124 @@
->>> ma.get_form(request).base_fields.keys() 
-['name', 'sign_date']
+
+# You can also pass a tuple to `exclude`.
+ 
+>>> class BandAdmin(ModelAdmin): 
+...     exclude = ('bio',) 
+>>> ma = BandAdmin(Band, site) 
+>>> ma.get_form(request).base_fields.keys() 
+['name', 'sign_date']
- 
-# Using `fields` and `exclude`.