Skip to content

Remove Django 1.6 (and Python 2.6) Support #3429

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

Closed
carltongibson wants to merge 6 commits into from
Closed

Remove Django 1.6 (and Python 2.6) Support #3429

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5c0dffa
Remove Django 1.6 from test matrix
Sep 22, 2015
68c88e1
Remove ContentType import fallback
Sep 22, 2015
6e86a53
Remove `apps.get_model` fallback
Sep 22, 2015
0b34408
Remove `unittest.skipUnless`
Sep 22, 2015
45ace50
Remove OrderedDict fallback
Sep 22, 2015
8d740a1
Adjust README and Release Notes
Sep 22, 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
Prev Previous commit
Next Next commit
Remove ContentType import fallback
  • Loading branch information
Carlton Gibson committed Sep 22, 2015
commit 68c88e180f1344bb641096276a23d5858aa065b9
10 changes: 0 additions & 10 deletions rest_framework/compat.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,6 @@ def distinct(queryset, base):
from django.db.models import get_model


# Import path changes from 1.7 onwards.
try:
from django.contrib.contenttypes.fields import (
GenericForeignKey, GenericRelation
)
except ImportError:
from django.contrib.contenttypes.generic import (
GenericForeignKey, GenericRelation
)

# django-filter is optional
try:
import django_filters
Expand Down
4 changes: 3 additions & 1 deletion tests/test_relations_generic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,14 @@
from __future__ import unicode_literals

from django.contrib.contenttypes.fields import (
GenericForeignKey, GenericRelation
)
from django.contrib.contenttypes.models import ContentType
from django.db import models
from django.test import TestCase
from django.utils.encoding import python_2_unicode_compatible

from rest_framework import serializers
from rest_framework.compat import GenericForeignKey, GenericRelation


@python_2_unicode_compatible
Expand Down