diff options
author | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2017-06-26 16:49:31 +0200 |
---|---|---|
committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2017-06-26 16:49:31 +0200 |
commit | 82b4622af05183b79ecbd4bce312dd109e14a2d6 (patch) | |
tree | 6c96ecd25f8eb21a19e24ff66ac9869ca820e3e6 /tests | |
parent | c63cc64f2b2214f0451c26edb3cba65b8c9144ae (diff) | |
download | raven-82b4622af05183b79ecbd4bce312dd109e14a2d6.tar.gz |
Fixed Django 2.0 compatibility due to:
- django.conf.urls.include parameters change,
- django.core.urlresolvers move to django.urls.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/contrib/django/test_resolver.py | 13 | ||||
-rw-r--r-- | tests/contrib/django/tests.py | 7 |
2 files changed, 16 insertions, 4 deletions
diff --git a/tests/contrib/django/test_resolver.py b/tests/contrib/django/test_resolver.py index 3960161..3f406cc 100644 --- a/tests/contrib/django/test_resolver.py +++ b/tests/contrib/django/test_resolver.py @@ -1,5 +1,7 @@ from __future__ import absolute_import +import django + try: from django.conf.urls import url, include except ImportError: @@ -8,9 +10,14 @@ except ImportError: from raven.contrib.django.resolver import RouteResolver -included_url_conf = ( - url(r'^foo/bar/(?P<param>[\w]+)', lambda x: ''), -), '', '' +if django.VERSION < (1, 9): + included_url_conf = ( + url(r'^foo/bar/(?P<param>[\w]+)', lambda x: ''), + ), '', '' +else: + included_url_conf = (( + url(r'^foo/bar/(?P<param>[\w]+)', lambda x: ''), + ), '') example_url_conf = ( url(r'^api/(?P<project_id>[\w_-]+)/store/$', lambda x: ''), diff --git a/tests/contrib/django/tests.py b/tests/contrib/django/tests.py index 0adf7c6..afc5d85 100644 --- a/tests/contrib/django/tests.py +++ b/tests/contrib/django/tests.py @@ -13,7 +13,6 @@ import sys from django.conf import settings from django.contrib.auth.models import User from django.core.exceptions import SuspiciousOperation -from django.core.urlresolvers import reverse from django.core.signals import got_request_exception from django.core.handlers.wsgi import WSGIRequest from django.http import QueryDict @@ -23,6 +22,12 @@ from django.test.client import Client as DjangoTestClient, ClientHandler as Djan from django.utils.translation import gettext_lazy from exam import fixture +try: + from django.urls import reverse +except ImportError: + # For Django version less than 1.10. + from django.core.urlresolvers import reverse + from raven.base import Client from raven.utils.compat import StringIO, iteritems, PY2, string_types, text_type from raven.contrib.django.client import DjangoClient |