From 044252af1c09b0da6899ffc3e88f192721cd38e3 Mon Sep 17 00:00:00 2001
From: Tom Christie <tom@tomchristie.com>
Date: Wed, 17 Jul 2019 14:17:45 +0100
Subject: [PATCH] Version 3.10.1 (#6817)

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

* Don't include autocomplete fields on TokenAuth admin

* Version 3.10.1
---
 rest_framework/__init__.py        | 2 +-
 rest_framework/authtoken/admin.py | 1 -
 rest_framework/compat.py          | 8 ++++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py
index 5ecc151e5..6a64c8b18 100644
--- a/rest_framework/__init__.py
+++ b/rest_framework/__init__.py
@@ -8,7 +8,7 @@ ______ _____ _____ _____    __
 """
 
 __title__ = 'Django REST framework'
-__version__ = '3.10.0'
+__version__ = '3.10.1'
 __author__ = 'Tom Christie'
 __license__ = 'BSD 2-Clause'
 __copyright__ = 'Copyright 2011-2019 Encode OSS Ltd'
diff --git a/rest_framework/authtoken/admin.py b/rest_framework/authtoken/admin.py
index 750e21cf4..1a507249b 100644
--- a/rest_framework/authtoken/admin.py
+++ b/rest_framework/authtoken/admin.py
@@ -7,7 +7,6 @@ class TokenAdmin(admin.ModelAdmin):
     list_display = ('key', 'user', 'created')
     fields = ('user',)
     ordering = ('-created',)
-    autocomplete_fields = ('user',)
 
 
 admin.site.register(Token, TokenAdmin)
diff --git a/rest_framework/compat.py b/rest_framework/compat.py
index 8d28b49e8..df100966b 100644
--- a/rest_framework/compat.py
+++ b/rest_framework/compat.py
@@ -93,12 +93,16 @@ except ImportError:
     postgres_fields = None
 
 
-# coreapi is optional (Note that uritemplate is a dependency of coreapi)
+# coreapi is required for CoreAPI schema generation
 try:
     import coreapi
-    import uritemplate
 except ImportError:
     coreapi = None
+
+# uritemplate is required for OpenAPI and CoreAPI schema generation
+try:
+    import uritemplate
+except ImportError:
     uritemplate = None