Refs #23919 -- Stopped inheriting from object to define new style classes.

1 files changed, 4 insertions, 6 deletions

diff --git a/django/forms/models.py b/django/forms/models.py
index 093a7a6078..e5a589bfba 100644
--- a/django/forms/models.py
+++ b/django/forms/models.py
@@ -184,7 +184,7 @@ def fields_for_model(model, fields=None, exclude=None, widgets=None,
     return field_dict
 
 
-class ModelFormOptions(object):
+class ModelFormOptions:
     def __init__(self, options=None):
         self.model = getattr(options, 'model', None)
         self.fields = getattr(options, 'fields', None)
@@ -517,10 +517,8 @@ def modelform_factory(model, form=ModelForm, fields=None, exclude=None,
 
     # If parent form class already has an inner Meta, the Meta we're
     # creating needs to inherit from the parent's inner meta.
-    parent = (object,)
-    if hasattr(form, 'Meta'):
-        parent = (form.Meta, object)
-    Meta = type(str('Meta'), parent, attrs)
+    bases = (form.Meta,) if hasattr(form, 'Meta') else ()
+    Meta = type(str('Meta'), bases, attrs)
     if formfield_callback:
         Meta.formfield_callback = staticmethod(formfield_callback)
     # Give this new form class a reasonable name.
@@ -1099,7 +1097,7 @@ class InlineForeignKeyField(Field):
         return False
 
 
-class ModelChoiceIterator(object):
+class ModelChoiceIterator:
     def __init__(self, field):
         self.field = field
         self.queryset = field.queryset