Fixed #13366 -- Corrected the field __setstate__ method to avoid a race condition when initially importing models. Thanks to Brett Hoerner for the report.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@13005 bcc190cf-cafb-0310-a4f2-bffc1f526a37

2 files changed, 7 insertions, 0 deletions

diff --git a/tests/regressiontests/admin_scripts/app_with_import/__init__.py b/tests/regressiontests/admin_scripts/app_with_import/__init__.py
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/tests/regressiontests/admin_scripts/app_with_import/__init__.py
diff --git a/tests/regressiontests/admin_scripts/app_with_import/models.py b/tests/regressiontests/admin_scripts/app_with_import/models.py
new file mode 100644
index 0000000000..06ca0e8a34
--- /dev/null
+++ b/tests/regressiontests/admin_scripts/app_with_import/models.py
@@ -0,0 +1,7 @@
+from django.contrib.comments.models import Comment
+from django.db import models
+
+# Regression for #13368. This is an example of a model
+# that imports a class that has an abstract base class.
+class CommentScore(models.Model):
+    comment = models.OneToOneField(Comment, primary_key=True)