Merge branch 'master' into set-retry-after

Conflicts:
	tests/test_throttling.py

1 files changed, 1 insertions, 1 deletions

diff --git a/rest_framework/views.py b/rest_framework/views.py
index d6ccb301..23df3443 100644
--- a/rest_framework/views.py
+++ b/rest_framework/views.py
@@ -31,6 +31,7 @@ def get_view_name(view_cls, suffix=None):
 
     return name
 
+
 def get_view_description(view_cls, html=False):
     """
     Given a view class, return a textual description to represent the view.
@@ -120,7 +121,6 @@ class APIView(View):
             headers['Vary'] = 'Accept'
         return headers
 
-
     def http_method_not_allowed(self, request, *args, **kwargs):
         """
         If `request.method` does not correspond to a handler method,