Fixed imports and url patterns to support django >= 1.10

dj_elastictranscoder/models.py

@@ -1,9 +1,10 @@
 from django.db import models
 from django.contrib.contenttypes.models import ContentType
 import django
-if django.get_version() >= '1.8':
+
+try:
     from django.contrib.contenttypes.fields import GenericForeignKey
-else:
+except ImportError:
     from django.contrib.contenttypes.generic import GenericForeignKey
 
 

dj_elastictranscoder/urls.py

@@ -1,8 +1,18 @@
+import django
+
+from dj_elastictranscoder.views import endpoint as transcoder_endpoint
+
 try:
     from django.conf.urls import url, patterns
 except ImportError:
-    from django.conf.urls.defaults import url, patterns  # Support for Django < 1.4
+    try:
+        from django.conf.urls.defaults import url, patterns  # Support for Django < 1.4
+    except ImportError:
+        from django.conf.urls import url
 
-urlpatterns = patterns('dj_elastictranscoder.views',
-    url(http://github.com/r'^endpoint/r'^endpoint/$', 'endpoint'#39;,%20'endpoint'),
-)
+if django.VERSION[0] >= 1 and django.VERSION[1] >= 10:
+    urlpatterns = (url(http://github.com/r'^endpoint/r'^endpoint/$', transcoder_endpoint, name='transcoder_endpoint'#39;,%20transcoder_endpoint,%20name='transcoder_endpoint'),)
+else:
+    urlpatterns = patterns('dj_elastictranscoder.views',
+        url(http://github.com/r'^endpoint/r'^endpoint/$', 'endpoint'#39;,%20'endpoint'),
+    )