diff --git a/longclaw/contrib/productrequests/wagtail_hooks.py b/longclaw/contrib/productrequests/wagtail_hooks.py index 962aec2..009180d 100644 --- a/longclaw/contrib/productrequests/wagtail_hooks.py +++ b/longclaw/contrib/productrequests/wagtail_hooks.py @@ -1,4 +1,7 @@ -from django.core.urlresolvers import reverse +try: + from django.urls import reverse +except ImportError: + from django.core.urlresolvers import reverse from wagtail.wagtailcore import hooks from wagtail.wagtailadmin import widgets diff --git a/longclaw/longclawbasket/tests.py b/longclaw/longclawbasket/tests.py index 20c2f89..c901bd9 100644 --- a/longclaw/longclawbasket/tests.py +++ b/longclaw/longclawbasket/tests.py @@ -1,6 +1,9 @@ from django.test.client import RequestFactory from django.test import TestCase -from django.core.urlresolvers import reverse +try: + from django.urls import reverse_lazy +except ImportError: + from django.core.urlresolvers import reverse_lazy from django.core.management import call_command from django.utils.six import StringIO @@ -66,7 +69,7 @@ class BasketTest(LongclawTestCase): """ Test we get a message and 400 status if we dont send data """ - response = self.client.post(reverse('longclaw_basket_list')) + response = self.client.post(reverse_lazy('longclaw_basket_list')) self.assertEqual(response.status_code, 400) diff --git a/longclaw/longclawcheckout/tests.py b/longclaw/longclawcheckout/tests.py index f8c9750..328e6c1 100644 --- a/longclaw/longclawcheckout/tests.py +++ b/longclaw/longclawcheckout/tests.py @@ -1,9 +1,9 @@ from django.test import TestCase from django.test.client import RequestFactory try: - from django.urls import reverse + from django.urls import reverse_lazy except ImportError: - from django.core.urlresolvers import reverse + from django.core.urlresolvers import reverse_lazy from longclaw.tests.utils import ( LongclawTestCase, @@ -106,7 +106,7 @@ class CheckoutTest(TestCase): """ Test the checkout GET view """ - request = RequestFactory().get(reverse('longclaw_checkout_view')) + request = RequestFactory().get(reverse_lazy('longclaw_checkout_view')) response = CheckoutView.as_view()(request) self.assertEqual(response.status_code, 200) @@ -116,7 +116,7 @@ class CheckoutTest(TestCase): """ country = CountryFactory() request = RequestFactory().post( - reverse('longclaw_checkout_view'), + reverse_lazy('longclaw_checkout_view'), { 'shipping-name': 'bob', 'shipping-line_1': 'blah blah', @@ -139,7 +139,7 @@ class CheckoutTest(TestCase): """ country = CountryFactory() request = RequestFactory().post( - reverse('longclaw_checkout_view'), + reverse_lazy('longclaw_checkout_view'), { 'shipping-name': 'bob', 'shipping-line_1': 'blah blah', @@ -168,7 +168,7 @@ class CheckoutTest(TestCase): the form page with the errors """ request = RequestFactory().post( - reverse('longclaw_checkout_view') + reverse_lazy('longclaw_checkout_view') ) request.session = {} bid = basket_id(request) @@ -182,7 +182,7 @@ class CheckoutTest(TestCase): """ address = AddressFactory() order = OrderFactory(shipping_address=address, billing_address=address) - response = self.client.get(reverse('longclaw_checkout_success', kwargs={'pk': order.id})) + response = self.client.get(reverse_lazy('longclaw_checkout_success', kwargs={'pk': order.id})) self.assertEqual(response.status_code, 200) diff --git a/longclaw/longclaworders/tests.py b/longclaw/longclaworders/tests.py index b44fba8..ff75e2d 100644 --- a/longclaw/longclaworders/tests.py +++ b/longclaw/longclaworders/tests.py @@ -2,9 +2,9 @@ import mock from django.test import TestCase from django.contrib.auth.models import User try: - from django.urls import reverse + from django.urls import reverse_lazy except ImportError: - from django.core.urlresolvers import reverse + from django.core.urlresolvers import reverse_lazy from django.contrib.auth.models import User from wagtail.tests.utils import WagtailTestUtils from longclaw.tests.utils import LongclawTestCase, OrderFactory @@ -50,11 +50,11 @@ class TestOrderView(LongclawTestCase, WagtailTestUtils): Test the index view """ name = self.model_admin.url_helper.get_action_url_name('index') - response = self.client.get(reverse(name)) + response = self.client.get(reverse_lazy(name)) self.assertEqual(response.status_code, 200) def test_order_detail_view(self): order = OrderFactory() name = self.model_admin.url_helper.get_action_url_name('detail') - response = self.client.get(reverse(name, kwargs={'instance_pk': order.pk})) + response = self.client.get(reverse_lazy(name, kwargs={'instance_pk': order.pk})) self.assertEqual(response.status_code, 200) diff --git a/longclaw/tests/utils.py b/longclaw/tests/utils.py index 98c5597..db3da31 100644 --- a/longclaw/tests/utils.py +++ b/longclaw/tests/utils.py @@ -1,5 +1,8 @@ import factory -from django.core.urlresolvers import reverse +try: + from django.urls import reverse_lazy +except ImportError: + from django.core.urlresolvers import reverse_lazy from rest_framework.test import APITestCase from rest_framework import status @@ -98,10 +101,10 @@ class LongclawTestCase(APITestCase): """ Submit a GET request and assert the response status code is 200 Arguments: - urlname (str): The url name to pass to the 'reverse' function - urlkwargs (dict): The `kwargs` parameter to pass to the `reverse` function + urlname (str): The url name to pass to the 'reverse_lazy' function + urlkwargs (dict): The `kwargs` parameter to pass to the `reverse_lazy` function """ - response = self.client.get(reverse(urlname, kwargs=urlkwargs), **kwargs) + response = self.client.get(reverse_lazy(urlname, kwargs=urlkwargs), **kwargs) self.assertEqual(response.status_code, status.HTTP_200_OK) return response @@ -110,10 +113,10 @@ class LongclawTestCase(APITestCase): Arguments: data (dict): The data to pass to the post request - urlname (str): The url name to pass to the 'reverse' function - urlkwargs (dict): The `kwargs` parameter to pass to the `reverse` function + urlname (str): The url name to pass to the 'reverse_lazy' function + urlkwargs (dict): The `kwargs` parameter to pass to the `reverse_lazy` function """ - response = self.client.post(reverse(urlname, kwargs=urlkwargs), data, **kwargs) + response = self.client.post(reverse_lazy(urlname, kwargs=urlkwargs), data, **kwargs) self.assertIn(response.status_code, (status.HTTP_201_CREATED, status.HTTP_200_OK, status.HTTP_204_NO_CONTENT)) return response @@ -121,16 +124,16 @@ class LongclawTestCase(APITestCase): def patch_test(self, data, urlname, urlkwargs=None, **kwargs): """ Submit a PATCH request and assert the response status code is 200 """ - response = self.client.patch(reverse(urlname, kwargs=urlkwargs), data, **kwargs) + response = self.client.patch(reverse_lazy(urlname, kwargs=urlkwargs), data, **kwargs) self.assertEqual(response.status_code, status.HTTP_200_OK) return response def put_test(self, data, urlname, urlkwargs=None, **kwargs): - response = self.client.put(reverse(urlname, kwargs=urlkwargs), data, **kwargs) + response = self.client.put(reverse_lazy(urlname, kwargs=urlkwargs), data, **kwargs) self.assertEqual(response.status_code, status.HTTP_202_ACCEPTED) return response def del_test(self, urlname, urlkwargs=None, **kwargs): - response = self.client.delete(reverse(urlname, kwargs=urlkwargs), **kwargs) + response = self.client.delete(reverse_lazy(urlname, kwargs=urlkwargs), **kwargs) self.assertEqual(response.status_code, status.HTTP_200_OK) return response diff --git a/setup.py b/setup.py index 2618aa8..fe047ff 100755 --- a/setup.py +++ b/setup.py @@ -88,7 +88,7 @@ setup( include_package_data=True, install_requires=[ 'django>=1.9', - 'wagtail>=1.9', + 'wagtail>1.9,<2.0', 'django-countries>=4.3', 'django-extensions>=1.7.5', 'djangorestframework>=3.5.4', @@ -106,8 +106,6 @@ setup( 'Intended Audience :: Developers', 'License :: OSI Approved :: BSD License', 'Natural Language :: English', - 'Programming Language :: Python :: 2', - 'Programming Language :: Python :: 2.7', 'Programming Language :: Python :: 3', 'Programming Language :: Python :: 3.3', 'Programming Language :: Python :: 3.4',