Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Commit a9427d6

Browse files
n2ygksliverc
authored andcommitted
properly anchor ends of url patterns (#697)
1 parent 189fdfe commit a9427d6

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

‎example/urls.py

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,37 +30,37 @@
3030

3131
urlpatterns = [
3232
url(r'^', include(router.urls)),
33-
url(r'^entries/(?P<entry_pk>[^/.]+)/suggested/',
33+
url(r'^entries/(?P<entry_pk>[^/.]+)/suggested/$',
3434
EntryViewSet.as_view({'get': 'list'}),
3535
name='entry-suggested'
3636
),
37-
url(r'entries/(?P<entry_pk>[^/.]+)/blog',
37+
url(r'entries/(?P<entry_pk>[^/.]+)/blog$',
3838
BlogViewSet.as_view({'get': 'retrieve'}),
3939
name='entry-blog'),
40-
url(r'entries/(?P<entry_pk>[^/.]+)/comments',
40+
url(r'entries/(?P<entry_pk>[^/.]+)/comments$',
4141
CommentViewSet.as_view({'get': 'list'}),
4242
name='entry-comments'),
43-
url(r'entries/(?P<entry_pk>[^/.]+)/authors',
43+
url(r'entries/(?P<entry_pk>[^/.]+)/authors$',
4444
AuthorViewSet.as_view({'get': 'list'}),
4545
name='entry-authors'),
46-
url(r'entries/(?P<entry_pk>[^/.]+)/featured',
46+
url(r'entries/(?P<entry_pk>[^/.]+)/featured$',
4747
EntryViewSet.as_view({'get': 'retrieve'}),
4848
name='entry-featured'),
4949

5050
url(r'^authors/(?P<pk>[^/.]+)/(?P<related_field>\w+)/$',
5151
AuthorViewSet.as_view({'get': 'retrieve_related'}),
5252
name='author-related'),
5353

54-
url(r'^entries/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)',
54+
url(r'^entries/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)$',
5555
EntryRelationshipView.as_view(),
5656
name='entry-relationships'),
57-
url(r'^blogs/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)',
57+
url(r'^blogs/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)$',
5858
BlogRelationshipView.as_view(),
5959
name='blog-relationships'),
60-
url(r'^comments/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)',
60+
url(r'^comments/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)$',
6161
CommentRelationshipView.as_view(),
6262
name='comment-relationships'),
63-
url(r'^authors/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)',
63+
url(r'^authors/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)$',
6464
AuthorRelationshipView.as_view(),
6565
name='author-relationships'),
6666
]

‎example/urls_test.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -44,47 +44,47 @@
4444
url(r'^', include(router.urls)),
4545

4646
# old tests
47-
url(r'identities/default/(?P<pk>\d+)',
47+
url(r'identities/default/(?P<pk>\d+)$',
4848
GenericIdentity.as_view(), name='user-default'),
4949

5050

51-
url(r'^entries/(?P<entry_pk>[^/.]+)/blog',
51+
url(r'^entries/(?P<entry_pk>[^/.]+)/blog$',
5252
BlogViewSet.as_view({'get': 'retrieve'}),
5353
name='entry-blog'
5454
),
55-
url(r'^entries/(?P<entry_pk>[^/.]+)/comments',
55+
url(r'^entries/(?P<entry_pk>[^/.]+)/comments$',
5656
CommentViewSet.as_view({'get': 'list'}),
5757
name='entry-comments'
5858
),
59-
url(r'^entries/(?P<entry_pk>[^/.]+)/suggested/',
59+
url(r'^entries/(?P<entry_pk>[^/.]+)/suggested/$',
6060
EntryViewSet.as_view({'get': 'list'}),
6161
name='entry-suggested'
6262
),
63-
url(r'^drf-entries/(?P<entry_pk>[^/.]+)/suggested/',
63+
url(r'^drf-entries/(?P<entry_pk>[^/.]+)/suggested/$',
6464
DRFEntryViewSet.as_view({'get': 'list'}),
6565
name='drf-entry-suggested'
6666
),
67-
url(r'entries/(?P<entry_pk>[^/.]+)/authors',
67+
url(r'entries/(?P<entry_pk>[^/.]+)/authors$',
6868
AuthorViewSet.as_view({'get': 'list'}),
6969
name='entry-authors'),
70-
url(r'entries/(?P<entry_pk>[^/.]+)/featured',
70+
url(r'entries/(?P<entry_pk>[^/.]+)/featured$',
7171
EntryViewSet.as_view({'get': 'retrieve'}),
7272
name='entry-featured'),
7373

7474
url(r'^authors/(?P<pk>[^/.]+)/(?P<related_field>\w+)/$',
7575
AuthorViewSet.as_view({'get': 'retrieve_related'}),
7676
name='author-related'),
7777

78-
url(r'^entries/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)',
78+
url(r'^entries/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)$',
7979
EntryRelationshipView.as_view(),
8080
name='entry-relationships'),
81-
url(r'^blogs/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)',
81+
url(r'^blogs/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)$',
8282
BlogRelationshipView.as_view(),
8383
name='blog-relationships'),
84-
url(r'^comments/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)',
84+
url(r'^comments/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)$',
8585
CommentRelationshipView.as_view(),
8686
name='comment-relationships'),
87-
url(r'^authors/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)',
87+
url(r'^authors/(?P<pk>[^/.]+)/relationships/(?P<related_field>\w+)$',
8888
AuthorRelationshipView.as_view(),
8989
name='author-relationships'),
9090
]

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /