summaryrefslogtreecommitdiff
path: root/django
diff options
context:
space:
mode:
Diffstat (limited to 'django')
-rw-r--r--django/db/migrations/operations/models.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/django/db/migrations/operations/models.py b/django/db/migrations/operations/models.py
index a0e81f5e83..027ebfe95a 100644
--- a/django/db/migrations/operations/models.py
+++ b/django/db/migrations/operations/models.py
@@ -109,7 +109,10 @@ class CreateModel(ModelOperation):
return True
# Check we didn't inherit from the model
- models_to_check = [base for base in self.bases if base is not models.Model]
+ models_to_check = [
+ base for base in self.bases
+ if base is not models.Model and isinstance(base, (models.base.ModelBase, six.string_types))
+ ]
# Check we have no FKs/M2Ms with it
for fname, field in self.fields:
if field.remote_field: