Refs #23919 -- Used DeclarativeFieldsMetaclass.__prepare__() for tracking form field order.

1 files changed, 5 insertions, 1 deletions

diff --git a/django/forms/forms.py b/django/forms/forms.py
index 7fccdc2b65..5770f6d609 100644
--- a/django/forms/forms.py
+++ b/django/forms/forms.py
@@ -34,7 +34,6 @@ class DeclarativeFieldsMetaclass(MediaDefiningClass):
             if isinstance(value, Field):
                 current_fields.append((key, value))
                 attrs.pop(key)
-        current_fields.sort(key=lambda x: x[1].creation_counter)
         attrs['declared_fields'] = OrderedDict(current_fields)
 
         new_class = super(DeclarativeFieldsMetaclass, mcs).__new__(mcs, name, bases, attrs)
@@ -56,6 +55,11 @@ class DeclarativeFieldsMetaclass(MediaDefiningClass):
 
         return new_class
 
+    @classmethod
+    def __prepare__(metacls, name, bases, **kwds):
+        # Remember the order in which form fields are defined.
+        return OrderedDict()
+
 
 @html_safe
 class BaseForm: