Skip to content

fixes #8, deprecation for GenericForeignKey in Django1.9 and bump version #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 19, 2015
Merged

fixes #8, deprecation for GenericForeignKey in Django1.9 and bump version #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a711cc6
fixes #8, deprecation for GenericForeignKey in Django1.9 and bump
Nov 19, 2015
ef59c4f
fix the checks and typos
Nov 19, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dj_elastictranscoder/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '0.9.3'
__version__ = '0.9.4'
6 changes: 5 additions & 1 deletion dj_elastictranscoder/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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):
Expand Down