Skip to content
This repository was archived by the owner on Apr 15, 2025. It is now read-only.

Commit c0c234c

Browse files
committed
Merge pull request StreetVoice#9 from vinitkumar/fix/deprecation-warning
fixes StreetVoice#8, deprecation for GenericForeignKey in Django1.9 and bump version
2 parents f91c2ac + ef59c4f commit c0c234c

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

dj_elastictranscoder/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '0.9.3'
1+
__version__ = '0.9.4'

dj_elastictranscoder/models.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
from django.db import models
22
from django.contrib.contenttypes.models import ContentType
3-
from django.contrib.contenttypes.generic import GenericForeignKey
3+
import django
4+
if django.get_version() > '1.8':
5+
from django.contrib.contenttypes.fields import GenericForeignKey
6+
else:
7+
from django.contrib.contenttypes.generic import GenericForeignKey
48

59

610
class EncodeJob(models.Model):

0 commit comments

Comments
 (0)