diff --git a/django/forms/models.py b/django/forms/models.py
index e6bbb98..1c3b606 100644
--- a/django/forms/models.py
+++ b/django/forms/models.py
@@ -19,6 +19,11 @@ try:
set
except NameError:
from sets import Set as set # Python 2.3 fallback
+try:
+ sorted
+except NameError:
+ from django.utils.itercompat import sorted
+
__all__ = (
'ModelForm', 'BaseModelForm', 'model_to_dict', 'fields_for_model',
@@ -152,7 +157,7 @@ def fields_for_model(model, fields=None, exclude=None, formfield_callback=lambda
# TODO: if fields is provided, it would be nice to return fields in that order
field_list = []
opts = model._meta
- for f in opts.fields + opts.many_to_many:
+ for f in sorted(opts.fields + opts.many_to_many):
if not f.editable:
continue
if fields and not f.name in fields:
diff --git a/tests/modeltests/model_forms/models.py b/tests/modeltests/model_forms/models.py
index e12363c..44eaa56 100644
--- a/tests/modeltests/model_forms/models.py
+++ b/tests/modeltests/model_forms/models.py
@@ -291,7 +291,7 @@ familiar with the mechanics.
OddForm is now an Article-related thing, because BadForm.Meta overrides
CategoryForm.Meta.
>>> OddForm.base_fields.keys()
-['headline', 'slug', 'pub_date', 'writer', 'article', 'status', 'categories']
+['headline', 'slug', 'pub_date', 'writer', 'article', 'categories', 'status']
>>> class ArticleForm(ModelForm):
... class Meta:
@@ -302,7 +302,7 @@ First class with a Meta class wins.
>>> class BadForm(ArticleForm, CategoryForm):
... pass
>>> OddForm.base_fields.keys()
-['headline', 'slug', 'pub_date', 'writer', 'article', 'status', 'categories']
+['headline', 'slug', 'pub_date', 'writer', 'article', 'categories', 'status']
Subclassing without specifying a Meta on the class will use the parent's Meta
(or the first parent in the MRO if there are multiple parent classes).
@@ -453,17 +453,17 @@ fields with the 'choices' attribute are represented by a ChoiceField.
Article:
+
Categories:
Hold down "Control", or "Command" on a Mac, to select more than one.
Status:
-
Categories:
Hold down "Control", or "Command" on a Mac, to select more than one.
You can restrict a form to a subset of the complete list of fields
by providing a 'fields' argument. If you try to save a
@@ -508,17 +508,18 @@ inserted as 'initial' data in each Field.
Article:
+
Categories: Hold down "Control", or "Command" on a Mac, to select more than one.
Status:
-
Categories: Hold down "Control", or "Command" on a Mac, to select more than one.
+
>>> f = TestArticleForm({'headline': u'Test headline', 'slug': 'test-headline', 'pub_date': u'1984-02-06', 'writer': u'1', 'article': 'Hello.'}, instance=art)
>>> f.is_valid()
True
@@ -569,17 +570,17 @@ Add some categories and test the many-to-many form output.
Article:
+
Categories: Hold down "Control", or "Command" on a Mac, to select more than one.
Status:
-
Categories: Hold down "Control", or "Command" on a Mac, to select more than one.
>>> f = TestArticleForm({'headline': u'New headline', 'slug': u'new-headline', 'pub_date': u'1988-01-04',
... 'writer': u'1', 'article': u'Hello.', 'categories': [u'1', u'2']}, instance=new_art)
@@ -685,17 +686,17 @@ the data in the database when the form is instantiated.
Article:
+
Categories: Hold down "Control", or "Command" on a Mac, to select more than one.
Status:
-
Categories: Hold down "Control", or "Command" on a Mac, to select more than one.
>>> Category.objects.create(name='Fourth', url='4th')
>>> Writer.objects.create(name='Carl Bernstein')
@@ -711,18 +712,18 @@ the data in the database when the form is instantiated.
Article:
-
Status:
Categories: Hold down "Control", or "Command" on a Mac, to select more than one.