Merge pull request StreetVoice#9 from vinitkumar/fix/deprecation-warning

tzangms · tzangms · commit c0c234c59328 · 2015-11-19T16:13:06.000+08:00
fixes StreetVoice#8, deprecation for GenericForeignKey in Django1.9 and bump version
diff --git a/dj_elastictranscoder/__init__.py b/dj_elastictranscoder/__init__.py
@@ -1 +1 @@
-__version__ = '0.9.3'
+__version__ = '0.9.4'
diff --git a/dj_elastictranscoder/models.py b/dj_elastictranscoder/models.py
@@ -1,6 +1,10 @@
 from django.db import models
 from django.contrib.contenttypes.models import ContentType
-from django.contrib.contenttypes.generic import GenericForeignKey
+import django
+if django.get_version() > '1.8':
+    from django.contrib.contenttypes.fields import GenericForeignKey
+else:
+    from django.contrib.contenttypes.generic import GenericForeignKey
 
 
 class EncodeJob(models.Model):
