encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-25 19:14:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Version 3.10.1 (#6817)

Browse Source 
* Ensure that requiring 'uritemplate' does not also require 'coreapi'

* Don't include autocomplete fields on TokenAuth admin

* Version 3.10.1
This commit is contained in:
Tom Christie 2019-07-17 14:17:45 +01:00 committed by GitHub
parent 9114034856
commit 044252af1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest_framework/__init__.py
View File

@ -8,7 +8,7 @@ ______ _____ _____ _____ __
""" """
__title__ = 'Django REST framework' __title__ = 'Django REST framework'
__version__ = '3.10.0' __version__ = '3.10.1'
__author__ = 'Tom Christie' __author__ = 'Tom Christie'
__license__ = 'BSD 2-Clause' __license__ = 'BSD 2-Clause'
__copyright__ = 'Copyright 2011-2019 Encode OSS Ltd' __copyright__ = 'Copyright 2011-2019 Encode OSS Ltd'

1
rest_framework/authtoken/admin.py
View File

@ -7,7 +7,6 @@ class TokenAdmin(admin.ModelAdmin):
list_display = ('key', 'user', 'created') list_display = ('key', 'user', 'created')
fields = ('user',) fields = ('user',)
ordering = ('-created',) ordering = ('-created',)
autocomplete_fields = ('user',)
admin.site.register(Token, TokenAdmin) admin.site.register(Token, TokenAdmin)

8
rest_framework/compat.py
View File

@ -93,12 +93,16 @@ except ImportError:
postgres_fields = None postgres_fields = None
# coreapi is optional (Note that uritemplate is a dependency of coreapi) # coreapi is required for CoreAPI schema generation
try: try:
import coreapi import coreapi
import uritemplate
except ImportError: except ImportError:
coreapi = None coreapi = None
# uritemplate is required for OpenAPI and CoreAPI schema generation
try:
import uritemplate
except ImportError:
uritemplate = None uritemplate = None