Merge pull request #110 from ccnmtl/django-19

Django 1.9 compatibility

.travis.yml

@@ -3,9 +3,8 @@ sudo: false
 python:
   - "2.7"
 env:
-  - DJANGO="Django>=1.6.0,<1.7.0"
-  - DJANGO="Django>=1.7.0,<1.8.0"
   - DJANGO="Django>=1.8.0,<1.9.0"
+  - DJANGO="Django>=1.9.0,<1.10.0"
 
 # command to install dependencies
 install:

pagetree/__init__.py

@@ -1,3 +0,0 @@
-# This is required for south's syncdb to pick up TestBlock in
-# Django 1.6
-from pagetree.test_models import *

pagetree/generic/models.py

@@ -1,10 +1,6 @@
 from django import forms
 from django.db import models
-try:
-    from django.contrib.contenttypes.fields import GenericRelation
-except ImportError:
-    # Old location for django 1.6
-    from django.contrib.contenttypes.generic import GenericRelation
+from django.contrib.contenttypes.fields import GenericRelation
 
 from pagetree.models import PageBlock
 

pagetree/models.py

@@ -1,9 +1,5 @@
 import random
-try:
-    from django.apps import apps
-except ImportError:
-    # Django <= 1.6
-    from django.db.models import get_model
+from django.apps import apps
 from django.contrib.auth.models import User
 from django.core.cache import cache
 from django.db import models
@@ -12,7 +8,7 @@
 from django.template.loader import get_template
 from django.http import Http404
 from django.contrib.contenttypes.models import ContentType
-from django.contrib.contenttypes import generic
+from django.contrib.contenttypes.fields import GenericForeignKey
 from django.template.defaultfilters import slugify
 from json import dumps
 from treebeard.mp_tree import MP_Node
@@ -676,7 +672,7 @@ class PageBlock(models.Model):
 
     content_type = models.ForeignKey(ContentType)
     object_id = models.PositiveIntegerField()
-    content_object = generic.GenericForeignKey('content_type', 'object_id')
+    content_object = GenericForeignKey('content_type', 'object_id')
 
     class Meta:
         ordering = ('section', 'ordinality',)

pagetree/reports.py

@@ -1,11 +1,7 @@
 import abc
 
 from django.contrib.auth.models import User
-try:
-    from django.apps import apps
-except ImportError:
-    # Django <= 1.6
-    from django.db import models
+from django.apps import apps
 from django.contrib.contenttypes.models import ContentType