Skip to content

Commit 044252a

Browse files
authored
Version 3.10.1 (encode#6817)
* Ensure that requiring 'uritemplate' does not also require 'coreapi' * Don't include autocomplete fields on TokenAuth admin * Version 3.10.1
1 parent 9114034 commit 044252a

File tree

3 files changed

+7
-4
lines changed

3 files changed

+7
-4
lines changed

rest_framework/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"""
99

1010
__title__ = 'Django REST framework'
11-
__version__ = '3.10.0'
11+
__version__ = '3.10.1'
1212
__author__ = 'Tom Christie'
1313
__license__ = 'BSD 2-Clause'
1414
__copyright__ = 'Copyright 2011-2019 Encode OSS Ltd'

rest_framework/authtoken/admin.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ class TokenAdmin(admin.ModelAdmin):
77
list_display = ('key', 'user', 'created')
88
fields = ('user',)
99
ordering = ('-created',)
10-
autocomplete_fields = ('user',)
1110

1211

1312
admin.site.register(Token, TokenAdmin)

rest_framework/compat.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,12 +93,16 @@ def distinct(queryset, base):
9393
postgres_fields = None
9494

9595

96-
# coreapi is optional (Note that uritemplate is a dependency of coreapi)
96+
# coreapi is required for CoreAPI schema generation
9797
try:
9898
import coreapi
99-
import uritemplate
10099
except ImportError:
101100
coreapi = None
101+
102+
# uritemplate is required for OpenAPI and CoreAPI schema generation
103+
try:
104+
import uritemplate
105+
except ImportError:
102106
uritemplate = None
103107

104108

0 commit comments

Comments
 (0)