Fixed #408 - used remote_field instead of deprecated rel

.travis.yml

@@ -9,7 +9,9 @@ matrix:
     - python: 2.7
       env: TOXENV=py27-1.9
     - python: 2.7
-      env: TOXENV=py35-1.10
+      env: TOXENV=py27-1.10
+    - python: 2.7
+      env: TOXENV=py27-1.11
     - python: 3.3
       env: TOXENV=py33-1.8
     - python: 3.4
@@ -18,21 +20,26 @@ matrix:
       env: TOXENV=py34-1.9
     - python: 3.4
       env: TOXENV=py34-1.10
-    - python: 3.5
-      env: TOXENV=py35-1.8
+    - python: 3.4
+      env: TOXENV=py34-1.11
     - python: 3.5
       env: TOXENV=py35-1.9
     - python: 3.5
       env: TOXENV=py35-1.10
-    - python: 2.7
-      env: TOXENV=py27-master
+    - python: 3.5
+      env: TOXENV=py35-1.11
+    - python: 3.4
+      env: TOXENV=py34-master
     - python: 3.5
       env: TOXENV=py35-master
     - python: 2.7
       env: TOXENV=docs
 
   allow_failures:
-      - env: TOXENV=py27-master
+      - env: TOXENV=py27-1.11
+      - env: TOXENV=py34-1.11
+      - env: TOXENV=py35-1.11
+      - env: TOXENV=py34-master
       - env: TOXENV=py35-master
 install:
   - pip install tox

django_tables2/utils.py

@@ -360,9 +360,16 @@ def get_field(self, model):
                 field = model._meta.get_field(bit)
             except FieldDoesNotExist:
                 break
-            if hasattr(field, 'rel') and hasattr(field.rel, 'to'):
-                model = field.rel.to
-                continue
+
+            if hasattr(field, 'remote_field'):
+                rel = getattr(field, 'remote_field', None)
+                model = getattr(rel, 'model', model)
+
+            # !!! Support only for Django <= 1.8
+            # Remove this when support for Django 1.8 is over
+            else:
+                rel = getattr(field, 'rel', None)
+                model = getattr(rel, 'to', model)
 
         return field
 

requirements/django-dev.pip

@@ -1,2 +1,2 @@
 -r common.pip
-http://github.com/django/django/tarball/master
+https://github.com/django/django/archive/1.11a1.zip

tests/app/models.py

@@ -22,8 +22,12 @@ class Person(models.Model):
     last_name = models.CharField(max_length=200, verbose_name='surname')
 
     occupation = models.ForeignKey(
-        'Occupation', related_name='people',
-        null=True, verbose_name='occupation of the person')
+        'Occupation',
+        related_name='people',
+        null=True,
+        verbose_name='occupation of the person',
+        on_delete=models.CASCADE
+    )
 
     trans_test = models.CharField(
         max_length=200, blank=True,
@@ -42,7 +46,12 @@ class Person(models.Model):
 
     birthdate = models.DateField(null=True)
 
-    content_type = models.ForeignKey(ContentType, null=True, blank=True)
+    content_type = models.ForeignKey(
+        ContentType,
+        null=True,
+        blank=True,
+        on_delete=models.CASCADE
+    )
     object_id = models.PositiveIntegerField(null=True, blank=True)
     foreign_key = GenericForeignKey()
 
@@ -70,7 +79,7 @@ class Meta:
 @six.python_2_unicode_compatible
 class Occupation(models.Model):
     name = models.CharField(max_length=200)
-    region = models.ForeignKey('Region', null=True)
+    region = models.ForeignKey('Region', null=True, on_delete=models.CASCADE)
     boolean = models.BooleanField(null=True)
     boolean_with_choices = models.BooleanField(null=True, choices=(
         (True, 'Yes'),
@@ -87,15 +96,19 @@ def __str__(self):
 @six.python_2_unicode_compatible
 class Region(models.Model):
     name = models.CharField(max_length=200)
-    mayor = models.OneToOneField(Person, null=True)
+    mayor = models.OneToOneField(Person, null=True, on_delete=models.CASCADE)
 
     def __str__(self):
         return self.name
 
 
 class PersonInformation(models.Model):
     person = models.ForeignKey(
-        Person, related_name='info_list', verbose_name='Information')
+        Person,
+        related_name='info_list',
+        verbose_name='Information',
+        on_delete=models.CASCADE
+    )
 
 
 # -- haystack -----------------------------------------------------------------

tests/test_models.py

@@ -57,7 +57,7 @@ class Meta:
 
     class ComplexModel(models.Model):
         char = models.CharField(max_length=200)
-        fk = models.ForeignKey('self')
+        fk = models.ForeignKey('self', on_delete=models.CASCADE)
         m2m = models.ManyToManyField('self')
 
         class Meta:

tests/test_rows.py

@@ -3,6 +3,8 @@
 
 import django_tables2 as tables
 
+from django.db import models
+
 
 def test_bound_rows():
     class SimpleTable(tables.Table):
@@ -54,3 +56,44 @@ class SimpleTable(tables.Table):
     assert 'name' in row
     assert 'occupation' in row
     assert 'gamma' not in row
+
+
+def test_get_cell_display():
+
+    class A(models.Model):
+        foo = models.CharField(
+            max_length=1,
+            choices=(
+                ('a', 'valA'),
+                ('b', 'valB'),
+            )
+        )
+
+        class Meta:
+            app_label = 'django_tables2_test'
+
+    class B(models.Model):
+        a = models.ForeignKey(A, on_delete=models.CASCADE)
+
+        class Meta:
+            app_label = 'django_tables2_test'
+
+    class C(models.Model):
+        b = models.ForeignKey(B, on_delete=models.CASCADE)
+
+        class Meta:
+            app_label = 'django_tables2_test'
+
+    class Tab(tables.Table):
+        a = tables.Column(accessor="b.a.foo")
+
+        class Meta:
+            model = C
+
+    a = A(foo='a')
+    b = B(a=a)
+    c = C(b=b)
+
+    tab = Tab([c])
+    row = tab.rows[0]
+    assert row.get_cell('a') == 'valA'

tox.ini

@@ -6,7 +6,8 @@ norecursedirs = docs *.egg-info .git example .tox
 args_are_paths = false
 envlist =
     {py27,py33,py34}-{1.8},
-    {py27,py34,py35}-{1.9,1.10,master},
+    {py27,py34,py35}-{1.9,1.10,1.11},
+    {py34,py35}-{master},
     docs
 
 [testenv]
@@ -21,11 +22,11 @@ setenv = PYTHONPATH={toxinidir}
 commands =
     py.test -rw --cov=django_tables2 --cov-report term-missing
     flake8
-
 deps =
     1.8: Django>=1.8,<1.9
     1.9: Django>=1.9,<1.10
     1.10: Django==1.10.1
+    1.11: Django==1.11a1
     pytest-warnings
     master: https://github.com/django/django/archive/master.tar.gz
     -r{toxinidir}/requirements/common.pip