From e2fe0429abb1fafee7643b9361b808f982ddaf98 Mon Sep 17 00:00:00 2001
From: Mariusz Felisiak <felisiak.mariusz@gmail.com>
Date: Tue, 2 Nov 2021 15:34:08 +0100
Subject: [4.0.x] Fixed #33234 -- Fixed autodetector crash for proxy models
 inheriting from non-model class.

Regression in aa4acc164d1247c0de515c959f7b09648b57dc42.

Thanks Kevin Marsh for the report.
Backport of dab48b7482295956973879d15bfd4d3bb0718772 from main
---
 django/db/migrations/state.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'django')

diff --git a/django/db/migrations/state.py b/django/db/migrations/state.py
index 2927e66f83..d3e2098a67 100644
--- a/django/db/migrations/state.py
+++ b/django/db/migrations/state.py
@@ -476,6 +476,8 @@ class ProjectState:
 
     def _find_concrete_model_from_proxy(self, proxy_models, model_state):
         for base in model_state.bases:
+            if not (isinstance(base, str) or issubclass(base, models.Model)):
+                continue
             base_key = make_model_tuple(base)
             base_state = proxy_models.get(base_key)
             if not base_state:
-- 
cgit v1.3