Add django-upgrade to pre-commit hooks (#9683)

Author: ulgens

.pre-commit-config.yaml

@@ -43,3 +43,7 @@ repos:
   rev: v2.11.1
   hooks:
   - id: pyproject-fmt
+- repo: https://github.com/adamchainz/django-upgrade
+  rev: 1.24.0
+  hooks:
+  - id: django-upgrade

rest_framework/authentication.py

@@ -17,7 +17,7 @@ def get_authorization_header(request):
 
     Hide some test client ickyness where the header can be unicode.
     """
-    auth = request.META.get('HTTP_AUTHORIZATION', b'')
+    auth = request.headers.get('authorization', b'')
     if isinstance(auth, str):
         # Work around django test client oddness
         auth = auth.encode(HTTP_HEADER_ENCODING)

rest_framework/authtoken/admin.py

@@ -21,6 +21,7 @@ def url_for_result(self, result):
                        current_app=self.model_admin.admin_site.name)
 
 
+@admin.register(TokenProxy)
 class TokenAdmin(admin.ModelAdmin):
     list_display = ('key', 'user', 'created')
     list_filter = ('created',)
@@ -50,6 +51,3 @@ def delete_model(self, request, obj):
         # Map back to actual Token, since delete() uses pk.
         token = Token.objects.get(key=obj.key)
         return super().delete_model(request, token)
-
-
-admin.site.register(TokenProxy, TokenAdmin)

rest_framework/negotiation.py

@@ -93,5 +93,5 @@ def get_accept_list(self, request):
         Given the incoming request, return a tokenized list of media
         type strings.
         """
-        header = request.META.get('HTTP_ACCEPT', '*/*')
+        header = request.headers.get('accept', '*/*')
         return [token.strip() for token in header.split(',')]

rest_framework/throttling.py

@@ -26,7 +26,7 @@ def get_ident(self, request):
         if present and number of proxies is > 0. If not use all of
         HTTP_X_FORWARDED_FOR if it is available, if not use REMOTE_ADDR.
         """
-        xff = request.META.get('HTTP_X_FORWARDED_FOR')
+        xff = request.headers.get('x-forwarded-for')
         remote_addr = request.META.get('REMOTE_ADDR')
         num_proxies = api_settings.NUM_PROXIES
 

tests/test_decorators.py

@@ -178,7 +178,7 @@ def view(request):
     def test_content_negotiation(self):
         class CustomContentNegotiation(BaseContentNegotiation):
             def select_renderer(self, request, renderers, format_suffix):
-                assert request.META['HTTP_ACCEPT'] == 'custom/type'
+                assert request.headers['accept'] == 'custom/type'
                 return (renderers[0], renderers[0].media_type)
 
         @api_view(["GET"])

tests/test_middleware.py

@@ -99,7 +99,7 @@ def test_middleware_can_access_user_when_processing_response(self):
         key = 'abcd1234'
         Token.objects.create(key=key, user=user)
 
-        self.client.get('/auth', HTTP_AUTHORIZATION='Token %s' % key)
+        self.client.get('/auth', headers={"authorization": 'Token %s' % key})
 
     @override_settings(MIDDLEWARE=('tests.test_middleware.RequestPOSTMiddleware',))
     def test_middleware_can_access_request_post_when_processing_response(self):

tests/test_relations.py

@@ -4,7 +4,7 @@
 from _pytest.monkeypatch import MonkeyPatch
 from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist
 from django.test import override_settings
-from django.urls import re_path
+from django.urls import path
 from django.utils.datastructures import MultiValueDict
 
 from rest_framework import relations, serializers
@@ -152,7 +152,7 @@ def test_pk_representation(self):
 
 
 urlpatterns = [
-    re_path(r'^example/(?P<name>.+)/$', lambda: None, name='example'),
+    path('example/<path:name>/', lambda: None, name='example'),
 ]
 
 

tests/test_renderers.py

@@ -174,30 +174,30 @@ def test_head_method_serializes_no_content(self):
 
     def test_default_renderer_serializes_content_on_accept_any(self):
         """If the Accept header is set to */* the default renderer should serialize the response."""
-        resp = self.client.get('/', HTTP_ACCEPT='*/*')
+        resp = self.client.get('/', headers={"accept": '*/*'})
         self.assertEqual(resp['Content-Type'], RendererA.media_type + '; charset=utf-8')
         self.assertEqual(resp.content, RENDERER_A_SERIALIZER(DUMMYCONTENT))
         self.assertEqual(resp.status_code, DUMMYSTATUS)
 
     def test_specified_renderer_serializes_content_default_case(self):
         """If the Accept header is set the specified renderer should serialize the response.
         (In this case we check that works for the default renderer)"""
-        resp = self.client.get('/', HTTP_ACCEPT=RendererA.media_type)
+        resp = self.client.get('/', headers={"accept": RendererA.media_type})
         self.assertEqual(resp['Content-Type'], RendererA.media_type + '; charset=utf-8')
         self.assertEqual(resp.content, RENDERER_A_SERIALIZER(DUMMYCONTENT))
         self.assertEqual(resp.status_code, DUMMYSTATUS)
 
     def test_specified_renderer_serializes_content_non_default_case(self):
         """If the Accept header is set the specified renderer should serialize the response.
         (In this case we check that works for a non-default renderer)"""
-        resp = self.client.get('/', HTTP_ACCEPT=RendererB.media_type)
+        resp = self.client.get('/', headers={"accept": RendererB.media_type})
         self.assertEqual(resp['Content-Type'], RendererB.media_type + '; charset=utf-8')
         self.assertEqual(resp.content, RENDERER_B_SERIALIZER(DUMMYCONTENT))
         self.assertEqual(resp.status_code, DUMMYSTATUS)
 
     def test_unsatisfiable_accept_header_on_request_returns_406_status(self):
         """If the Accept header is unsatisfiable we should return a 406 Not Acceptable response."""
-        resp = self.client.get('/', HTTP_ACCEPT='foo/bar')
+        resp = self.client.get('/', headers={"accept": 'foo/bar'})
         self.assertEqual(resp.status_code, status.HTTP_406_NOT_ACCEPTABLE)
 
     def test_specified_renderer_serializes_content_on_format_query(self):
@@ -228,14 +228,14 @@ def test_specified_renderer_is_used_on_format_query_with_matching_accept(self):
             RendererB.format
         )
         resp = self.client.get('/' + param,
-                               HTTP_ACCEPT=RendererB.media_type)
+                               headers={"accept": RendererB.media_type})
         self.assertEqual(resp['Content-Type'], RendererB.media_type + '; charset=utf-8')
         self.assertEqual(resp.content, RENDERER_B_SERIALIZER(DUMMYCONTENT))
         self.assertEqual(resp.status_code, DUMMYSTATUS)
 
     def test_parse_error_renderers_browsable_api(self):
         """Invalid data should still render the browsable API correctly."""
-        resp = self.client.post('/parseerror', data='foobar', content_type='application/json', HTTP_ACCEPT='text/html')
+        resp = self.client.post('/parseerror', data='foobar', content_type='application/json', headers={"accept": 'text/html'})
         self.assertEqual(resp['Content-Type'], 'text/html; charset=utf-8')
         self.assertEqual(resp.status_code, status.HTTP_400_BAD_REQUEST)
 
@@ -834,19 +834,19 @@ class DummyView:
         assert result is None
 
     def test_extra_actions_dropdown(self):
-        resp = self.client.get('/api/examples/', HTTP_ACCEPT='text/html')
+        resp = self.client.get('/api/examples/', headers={"accept": 'text/html'})
         assert 'id="extra-actions-menu"' in resp.content.decode()
         assert '/api/examples/list_action/' in resp.content.decode()
         assert '>Extra list action<' in resp.content.decode()
 
     def test_extra_actions_dropdown_not_authed(self):
-        resp = self.client.get('/api/unauth-examples/', HTTP_ACCEPT='text/html')
+        resp = self.client.get('/api/unauth-examples/', headers={"accept": 'text/html'})
         assert 'id="extra-actions-menu"' not in resp.content.decode()
         assert '/api/examples/list_action/' not in resp.content.decode()
         assert '>Extra list action<' not in resp.content.decode()
 
     def test_options_form_does_not_check_object_permissions_for_extra_action(self):
-        resp = self.client.get('/api/issue-6855/1/extra_action/', HTTP_ACCEPT='text/html')
+        resp = self.client.get('/api/issue-6855/1/extra_action/', headers={"accept": 'text/html'})
         assert resp.status_code == status.HTTP_200_OK
 
     def test_delete_form_still_checks_object_permissions(self):

tests/test_requests_client.py

@@ -28,7 +28,7 @@ def post(self, request):
         }
         post = request.POST
         json = None
-        if request.META.get('CONTENT_TYPE') == 'application/json':
+        if request.headers.get('content-type') == 'application/json':
             json = request.data
 
         return Response({