(unfinished) fixes for Django 2.0

.travis.yml

@@ -24,6 +24,8 @@ matrix:
       env: DJANGO="Django>=1.9,<1.10"
     - python: "3.3"
       env: DJANGO="Django>=1.10,<1.11"
+    - python: "2.7"
+      env: DJANGO="https://github.com/django/django/archive/master.tar.gz"
     - python: "3.3"
       env: DJANGO="Django>=1.11,<1.12"
     - python: "3.3"

import_export/admin.py

@@ -13,6 +13,10 @@
 from django.contrib.admin.models import LogEntry, ADDITION, CHANGE, DELETION
 from django.contrib.contenttypes.models import ContentType
 from django.http import HttpResponseRedirect, HttpResponse
+try:
+    from django.urls import reverse
+except ImportError:  # Django<2.0
+    from django.core.urlresolvers import reverse
 from django.conf import settings
 from django.template.defaultfilters import pluralize
 from django.utils.decorators import method_decorator
@@ -37,10 +41,6 @@
 except ImportError:
     from django.utils.encoding import force_unicode as force_text
 
-try:
-    from django.core.urlresolvers import reverse
-except ImportError:
-    from django.urls import reverse
 SKIP_ADMIN_LOG = getattr(settings, 'IMPORT_EXPORT_SKIP_ADMIN_LOG', False)
 TMP_STORAGE_CLASS = getattr(settings, 'IMPORT_EXPORT_TMP_STORAGE_CLASS',
                             TempFolderStorage)

import_export/resources.py

@@ -60,6 +60,14 @@ def emit(self, record):
 USE_TRANSACTIONS = getattr(settings, 'IMPORT_EXPORT_USE_TRANSACTIONS', True)
 
 
+def get_related_model(field):
+    if hasattr(field, 'related_model'):
+        return field.related_model
+    # Django 1.6, 1.7
+    if field.rel:
+        return field.rel.to
+
+
 class ResourceOptions(object):
     """
     The inner Meta class allows for class-level configuration of how the
@@ -700,15 +708,15 @@ def __new__(cls, name, bases, attrs):
                             # the next model.
                             if isinstance(f, ForeignObjectRel):
                                 if RelatedObject is None:
-                                    model = f.related_model
+                                    model = get_related_model(f)
                                 else:
                                     # Django < 1.8
                                     model = f.model
                             else:
-                                if f.rel is None:
+                                if get_related_model(f) is None:
                                     raise KeyError(
                                         '%s is not a relation' % verbose_path)
-                                model = f.rel.to
+                                model = get_related_model(f)
 
                     if isinstance(f, ForeignObjectRel):
                         f = f.field
@@ -737,10 +745,10 @@ def widget_from_django_field(cls, f, default=widgets.Widget):
         internal_type = f.get_internal_type() if callable(getattr(f, "get_internal_type", None)) else ""
         if internal_type in ('ManyToManyField', ):
             result = functools.partial(widgets.ManyToManyWidget,
-                                       model=f.rel.to)
+                                       model=get_related_model(f))
         if internal_type in ('ForeignKey', 'OneToOneField', ):
             result = functools.partial(widgets.ForeignKeyWidget,
-                                       model=f.rel.to)
+                                       model=get_related_model(f))
         if internal_type in ('DecimalField', ):
             result = widgets.DecimalWidget
         if internal_type in ('DateTimeField', ):

tests/core/models.py

@@ -26,7 +26,7 @@ def __str__(self):
 @python_2_unicode_compatible
 class Book(models.Model):
     name = models.CharField('Book name', max_length=100)
-    author = models.ForeignKey(Author, blank=True, null=True)
+    author = models.ForeignKey(Author, blank=True, null=True, on_delete=models.CASCADE)
     author_email = models.EmailField('Author email', max_length=75, blank=True)
     imported = models.BooleanField(default=False)
     published = models.DateField('Published', blank=True, null=True)
@@ -49,20 +49,20 @@ def __str__(self):
 
 @python_2_unicode_compatible
 class Child(models.Model):
-    parent = models.ForeignKey(Parent)
+    parent = models.ForeignKey(Parent, on_delete=models.CASCADE)
     name = models.CharField(max_length=100)
 
     def __str__(self):
         return '%s - child of %s' % (self.name, self.parent.name)
 
 
 class Profile(models.Model):
-    user = models.OneToOneField('auth.User')
+    user = models.OneToOneField('auth.User', on_delete=models.CASCADE)
     is_private = models.BooleanField(default=True)
 
 
 class Entry(models.Model):
-    user = models.ForeignKey('auth.User')
+    user = models.ForeignKey('auth.User', on_delete=models.CASCADE)
 
 
 class WithDefault(models.Model):

tests/urls.py

@@ -9,7 +9,7 @@
 
 
 urlpatterns = [
-    url(r'^admin/', include(admin.site.urls)),
+    url(r'^admin/', admin.site.urls),
 ]
 
 urlpatterns += staticfiles_urlpatterns()