Skip to content

Get rid of Django 2.0 DeprecationWarning #78

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.

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 3 commits into from
May 10, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 5 additions & 1 deletion django_object_actions/tests/test_admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,14 @@
"""
from __future__ import unicode_literals

from django.core.urlresolvers import reverse
from django.http import HttpResponse
from mock import patch

try:
from django.urls import reverse
except ImportError:
from django.core.urlresolvers import reverse # < django 1.10

from .tests import LoggedInTestCase
from example_project.polls.factories import CommentFactory, PollFactory

Expand Down
5 changes: 4 additions & 1 deletion django_object_actions/tests/tests.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,7 @@
from django.core.urlresolvers import reverse
try:
from django.urls import reverse
except ImportError:
from django.core.urlresolvers import reverse # < django 1.10
from django.test import TestCase

from example_project.polls.factories import UserFactory
Expand Down
6 changes: 5 additions & 1 deletion django_object_actions/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,18 @@

from django.conf.urls import url
from django.contrib import messages
from django.core.urlresolvers import reverse
from django.db.models.query import QuerySet
from django.http import Http404, HttpResponseRedirect
from django.http.response import HttpResponseBase
from django.views.generic import View
from django.views.generic.detail import SingleObjectMixin
from django.views.generic.list import MultipleObjectMixin

try:
from django.urls import reverse
except ImportError:
from django.core.urlresolvers import reverse # < django 1.10


class BaseDjangoObjectActions(object):
"""
Expand Down
6 changes: 5 additions & 1 deletion example_project/polls/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,14 @@

from django.contrib import admin
from django.contrib.admin import AdminSite
from django.core.urlresolvers import reverse
from django.db.models import F
from django.http import HttpResponseRedirect

try:
from django.urls import reverse
except ImportError:
from django.core.urlresolvers import reverse # < django 1.10

from django_object_actions import (
DjangoObjectActions, takes_instance_or_queryset)

Expand Down
5 changes: 5 additions & 0 deletions example_project/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,11 @@ def project_dir(*paths):
{
'BACKEND': 'django.template.backends.django.DjangoTemplates',
'APP_DIRS': True,
'OPTIONS': {
'context_processors': [
'django.contrib.auth.context_processors.auth',
],
},
},
]

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
dj-database-url==0.4.1
# Can upgrade once we lose DJANGO1.7
django-extensions==1.6.7
factory-boy==2.7.0
factory-boy==2.8.1
faker==0.7.7
coverage==4.2
mock==2.0.0
2 changes: 2 additions & 0 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ envlist =
django18-{py27,py34,py35},
django19-{py27,py34,py35},
django110-{py27,py35},
django111-{py27,py35},
# run one of the tests again but with coverage
coveralls-django110-py35,
skipsdist = True
Expand All @@ -23,6 +24,7 @@ deps =
django18: Django<1.9
django19: Django<1.10
django110: Django<1.11
django111: Django>=1.11rc1,<2.0

[testenv:coveralls-django110-py35]
commands =
Expand Down