Skip to content

Commit 2d3e720

Browse files
committed
Fix import NoReverseMatch
1 parent f0158f6 commit 2d3e720

18 files changed

+111
-23
lines changed

.coverage

+1
Large diffs are not rendered by default.

example/models.py

+13-6
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class Meta:
6060
class Author(BaseModel):
6161
name = models.CharField(max_length=50)
6262
email = models.EmailField()
63-
type = models.ForeignKey(AuthorType, null=True)
63+
type = models.ForeignKey(AuthorType, null=True, on_delete=models.CASCADE)
6464

6565
def __str__(self):
6666
return self.name
@@ -71,7 +71,9 @@ class Meta:
7171

7272
@python_2_unicode_compatible
7373
class AuthorBio(BaseModel):
74-
author = models.OneToOneField(Author, related_name='bio')
74+
author = models.OneToOneField(
75+
Author, related_name='bio', on_delete=models.CASCADE
76+
)
7577
body = models.TextField()
7678

7779
def __str__(self):
@@ -83,7 +85,7 @@ class Meta:
8385

8486
@python_2_unicode_compatible
8587
class Entry(BaseModel):
86-
blog = models.ForeignKey(Blog)
88+
blog = models.ForeignKey(Blog, on_delete=models.CASCADE)
8789
headline = models.CharField(max_length=255)
8890
body_text = models.TextField(null=True)
8991
pub_date = models.DateField(null=True)
@@ -103,12 +105,15 @@ class Meta:
103105

104106
@python_2_unicode_compatible
105107
class Comment(BaseModel):
106-
entry = models.ForeignKey(Entry, related_name='comments')
108+
entry = models.ForeignKey(
109+
Entry, related_name='comments', on_delete=models.CASCADE
110+
)
107111
body = models.TextField()
108112
author = models.ForeignKey(
109113
Author,
110114
null=True,
111-
blank=True
115+
blank=True,
116+
on_delete=models.CASCADE
112117
)
113118

114119
def __str__(self):
@@ -133,7 +138,9 @@ class ResearchProject(Project):
133138
@python_2_unicode_compatible
134139
class Company(models.Model):
135140
name = models.CharField(max_length=100)
136-
current_project = models.ForeignKey(Project, related_name='companies')
141+
current_project = models.ForeignKey(
142+
Project, related_name='companies', on_delete=models.CASCADE
143+
)
137144
future_projects = models.ManyToManyField(Project)
138145

139146
def __str__(self):

example/tests/integration/test_includes.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
import pytest
2-
from django.core.urlresolvers import reverse
2+
import django
3+
4+
if django.VERSION >= (1, 10):
5+
from django.urls import reverse
6+
else:
7+
from django.core.urlresolvers import reverse
38

49
from example.tests.utils import load_json
510

example/tests/integration/test_meta.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
from datetime import datetime
22

33
import pytest
4-
from django.core.urlresolvers import reverse
4+
import django
5+
6+
if django.VERSION >= (1, 10):
7+
from django.urls import reverse
8+
else:
9+
from django.core.urlresolvers import reverse
510

611
from example.tests.utils import load_json
712

example/tests/integration/test_model_resource_name.py

+7-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
from copy import deepcopy
22

33
import pytest
4-
from django.core.urlresolvers import reverse
4+
import django
5+
6+
if django.VERSION >= (1, 10):
7+
from django.urls import reverse
8+
else:
9+
from django.core.urlresolvers import reverse
10+
511
from rest_framework import status
612

713
from example import models, serializers, views

example/tests/integration/test_non_paginated_responses.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
import pytest
2-
from django.core.urlresolvers import reverse
2+
import django
3+
4+
if django.VERSION >= (1, 10):
5+
from django.urls import reverse
6+
else:
7+
from django.core.urlresolvers import reverse
38

49
from rest_framework_json_api.pagination import PageNumberPagination
510

example/tests/integration/test_pagination.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
import pytest
2-
from django.core.urlresolvers import reverse
2+
import django
3+
4+
if django.VERSION >= (1, 10):
5+
from django.urls import reverse
6+
else:
7+
from django.core.urlresolvers import reverse
38

49
from example.tests.utils import load_json
510

example/tests/integration/test_polymorphism.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22
import random
33

44
import pytest
5-
from django.core.urlresolvers import reverse
5+
import django
6+
7+
if django.VERSION >= (1, 10):
8+
from django.urls import reverse
9+
else:
10+
from django.core.urlresolvers import reverse
611

712
from example.tests.utils import load_json
813

example/tests/integration/test_sparse_fieldsets.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
11
import pytest
2-
from django.core.urlresolvers import reverse
2+
import django
3+
4+
if django.VERSION >= (1, 10):
5+
from django.urls import reverse
6+
else:
7+
from django.core.urlresolvers import reverse
38

49
pytestmark = pytest.mark.django_db
510

example/tests/test_format_keys.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
1+
import django
12
from django.contrib.auth import get_user_model
2-
from django.core.urlresolvers import reverse
33
from django.utils import encoding
44

55
from example.tests import TestBase
66
from example.tests.utils import load_json
77

8+
if django.VERSION >= (1, 10):
9+
from django.urls import reverse
10+
else:
11+
from django.core.urlresolvers import reverse
12+
813

914
class FormatKeysSetTests(TestBase):
1015
"""

example/tests/test_generic_validation.py

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
from django.core.urlresolvers import reverse
1+
import django
2+
if django.VERSION >= (1, 10):
3+
from django.urls import reverse
4+
else:
5+
from django.core.urlresolvers import reverse
26

37
from example.tests import TestBase
48
from example.tests.utils import load_json

example/tests/test_generic_viewset.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,10 @@
1+
import django
12
from django.conf import settings
2-
from django.core.urlresolvers import reverse
3+
4+
if django.VERSION >= (1, 10):
5+
from django.urls import reverse
6+
else:
7+
from django.core.urlresolvers import reverse
38

49
from example.tests import TestBase
510
from example.tests.utils import load_json

example/tests/test_model_viewsets.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,14 @@
11
import pytest
2+
import django
23
from django.conf import settings
34
from django.contrib.auth import get_user_model
4-
from django.core.urlresolvers import reverse
55
from django.utils import encoding
66

7+
if django.VERSION >= (1, 10):
8+
from django.urls import reverse
9+
else:
10+
from django.core.urlresolvers import reverse
11+
712
from example.tests import TestBase
813
from example.tests.utils import dump_json, load_json
914

example/tests/test_multiple_id_mixin.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
import json
22

3-
from django.core.urlresolvers import reverse
3+
import django
44
from django.utils import encoding
55

6+
if django.VERSION >= (1, 10):
7+
from django.urls import reverse
8+
else:
9+
from django.core.urlresolvers import reverse
10+
611
from example.tests import TestBase
712

813

example/tests/test_serializers.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
import pytest
2-
from django.core.urlresolvers import reverse
2+
import django
33
from django.test import TestCase
44
from django.utils import timezone
55

6+
if django.VERSION >= (1, 10):
7+
from django.urls import reverse
8+
else:
9+
from django.core.urlresolvers import reverse
10+
611
from rest_framework_json_api.serializers import ResourceIdentifierObjectSerializer
712
from rest_framework_json_api.utils import format_resource_type
813

example/tests/test_sideload_resources.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,14 @@
33
"""
44
import json
55

6-
from django.core.urlresolvers import reverse
6+
import django
77
from django.utils import encoding
88

9+
if django.VERSION >= (1, 10):
10+
from django.urls import reverse
11+
else:
12+
from django.core.urlresolvers import reverse
13+
914
from example.tests import TestBase
1015

1116

example/tests/test_views.py

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
import json
22

3+
import django
34
from django.test import RequestFactory
45
from django.utils import timezone
5-
from rest_framework.reverse import reverse
6-
from rest_framework.test import APITestCase, force_authenticate
76

7+
if django.VERSION >= (1, 10):
8+
from django.urls import reverse
9+
else:
10+
from django.core.urlresolvers import reverse
11+
12+
from rest_framework.test import APITestCase, force_authenticate
813
from rest_framework_json_api.utils import format_resource_type
914

1015
from . import TestBase

rest_framework_json_api/relations.py

+6-1
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
import inflection
66
import six
7+
import django
78
from django.core.exceptions import ImproperlyConfigured
8-
from django.core.urlresolvers import NoReverseMatch
99
from django.utils.translation import ugettext_lazy as _
1010
from rest_framework.fields import MISSING_ERROR_MESSAGE
1111
from rest_framework.relations import MANY_RELATION_KWARGS, PrimaryKeyRelatedField
@@ -21,6 +21,11 @@
2121
get_resource_type_from_serializer
2222
)
2323

24+
if django.VERSION >= (1, 10):
25+
from django.urls import NoReverseMatch
26+
else:
27+
from django.core.urlresolvers import NoReverseMatch
28+
2429
LINKS_PARAMS = [
2530
'self_link_view_name',
2631
'related_link_view_name',

0 commit comments

Comments
 (0)