Removed CustomForeignKey for 1.8 compatability

Author: macro1

simple_history/models.py

@@ -10,7 +10,10 @@
 from django.db.models import loading
 from django.db.models.fields.proxy import OrderWrt
 from django.db.models.fields.related import RelatedField
-from django.db.models.related import RelatedObject
+try:
+    from django.db.models.fields.related import RelatedObject
+except ImportError:
+    pass
 from django.conf import settings
 from django.contrib import admin
 from django.utils import importlib, six
@@ -121,18 +124,22 @@ def copy_fields(self, model):
         for field in model._meta.fields:
             field = copy.copy(field)
             field.rel = copy.copy(field.rel)
+            if isinstance(field, OrderWrt):
+                # OrderWrt is a proxy field, switch to a plain IntegerField
+                field.__class__ = models.IntegerField
             if isinstance(field, models.ForeignKey):
                 # Don't allow reverse relations.
                 # ForeignKey knows best what datatype to use for the column
                 # we'll used that as soon as it's finalized by copying rel.to
-                field.__class__ = CustomForeignKeyField
+                old_field = field
+                field = type(field)(field.rel.to, related_name='+', null=True, blank=True)
+                field.rel = old_field.rel
                 field.rel.related_name = '+'
-                field.null = True
-                field.blank = True
-            if isinstance(field, OrderWrt):
-                # OrderWrt is a proxy field, switch to a plain IntegerField
-                field.__class__ = models.IntegerField
-            transform_field(field)
+                field.name = old_field.name
+                field.db_constraint = False
+                field._unique = False
+            else:
+                transform_field(field)
             fields[field.name] = field
         return fields
 

simple_history/tests/tests/test_models.py

@@ -488,11 +488,19 @@ def test_invalid_bases(self):
 
     def test_import_related(self):
         field_object = HistoricalChoice._meta.get_field_by_name('poll_id')[0]
-        self.assertEqual(field_object.related.model, Choice)
+        try:
+            related_model = field_object.rel.related_model
+        except AttributeError:  # Django<1.8
+            related_model = field_object.related.model
+        self.assertEqual(related_model, Choice)
 
     def test_string_related(self):
         field_object = HistoricalState._meta.get_field_by_name('library_id')[0]
-        self.assertEqual(field_object.related.model, State)
+        try:
+            related_model = field_object.rel.related_model
+        except AttributeError:  # Django<1.8
+            related_model = field_object.related.model
+        self.assertEqual(related_model, State)
 
     @skipUnless(django.get_version() >= "1.7", "Requires 1.7 migrations")
     def test_state_serialization_of_customfk(self):