summaryrefslogtreecommitdiff
path: root/tests/generic_views
diff options
context:
space:
mode:
authorMarten Kenbeek <marten.knbk@gmail.com>2015-12-30 16:51:16 +0100
committerTim Graham <timograham@gmail.com>2015-12-31 14:21:29 -0500
commit16411b8400ad08f90c236bb2e18f65c655f903f8 (patch)
treedf01123093c126222e8f492512472e5834966100 /tests/generic_views
parentdf3d5b1d73699b323aac377dffab039dca26c1e4 (diff)
downloaddjango-16411b8400ad08f90c236bb2e18f65c655f903f8.tar.gz
Fixed #26013 -- Moved django.core.urlresolvers to django.urls.
Thanks to Tim Graham for the review.
Diffstat (limited to 'tests/generic_views')
-rw-r--r--tests/generic_views/models.py2
-rw-r--r--tests/generic_views/test_base.py2
-rw-r--r--tests/generic_views/test_edit.py2
-rw-r--r--tests/generic_views/views.py2
4 files changed, 4 insertions, 4 deletions
diff --git a/tests/generic_views/models.py b/tests/generic_views/models.py
index d27a2fa912..afe4d042cd 100644
--- a/tests/generic_views/models.py
+++ b/tests/generic_views/models.py
@@ -1,7 +1,7 @@
-from django.core.urlresolvers import reverse
from django.db import models
from django.db.models import QuerySet
from django.db.models.manager import BaseManager
+from django.urls import reverse
from django.utils.encoding import python_2_unicode_compatible
diff --git a/tests/generic_views/test_base.py b/tests/generic_views/test_base.py
index 6d5045a81b..72c813b204 100644
--- a/tests/generic_views/test_base.py
+++ b/tests/generic_views/test_base.py
@@ -4,10 +4,10 @@ import time
import unittest
from django.core.exceptions import ImproperlyConfigured
-from django.core.urlresolvers import resolve
from django.http import HttpResponse
from django.test import RequestFactory, SimpleTestCase, override_settings
from django.test.utils import require_jinja2
+from django.urls import resolve
from django.views.generic import RedirectView, TemplateView, View
from . import views
diff --git a/tests/generic_views/test_edit.py b/tests/generic_views/test_edit.py
index ba855f3cd1..b4b2986eed 100644
--- a/tests/generic_views/test_edit.py
+++ b/tests/generic_views/test_edit.py
@@ -2,9 +2,9 @@ from __future__ import unicode_literals
from django import forms
from django.core.exceptions import ImproperlyConfigured
-from django.core.urlresolvers import reverse
from django.test import SimpleTestCase, TestCase, override_settings
from django.test.client import RequestFactory
+from django.urls import reverse
from django.views.generic.base import View
from django.views.generic.edit import CreateView, FormMixin, ModelFormMixin
diff --git a/tests/generic_views/views.py b/tests/generic_views/views.py
index 11e1ec3b4d..e46bc09143 100644
--- a/tests/generic_views/views.py
+++ b/tests/generic_views/views.py
@@ -2,7 +2,7 @@ from __future__ import unicode_literals
from django.contrib.auth.decorators import login_required
from django.core.paginator import Paginator
-from django.core.urlresolvers import reverse, reverse_lazy
+from django.urls import reverse, reverse_lazy
from django.utils.decorators import method_decorator
from django.views import generic