chore: run django-upgrade

Author: Agrendalath

completion_aggregator/api/v0/urls.py

@@ -4,18 +4,18 @@
 
 from __future__ import absolute_import, division, print_function, unicode_literals
 
-from django.urls import re_path
+from django.urls import path
 
 from . import views
 
 app_name = 'completion_aggregator'
 
 urlpatterns = [
-    re_path(
-        r'^course/(?P<course_key>.+)/blocks/(?P<block_key>.+)/$',
+    path(
+        'course/<path:course_key>/blocks/<path:block_key>/',
         views.CompletionBlockUpdateView.as_view(),
         name='blockcompletion-update'
     ),
-    re_path(r'^course/$', views.CompletionListView.as_view(), name='aggregator-list'),
-    re_path(r'^course/(?P<course_key>.+)/$', views.CompletionDetailView.as_view(), name='aggregator-detail'),
+    path('course/', views.CompletionListView.as_view(), name='aggregator-list'),
+    path('course/<path:course_key>/', views.CompletionDetailView.as_view(), name='aggregator-detail'),
 ]

completion_aggregator/api/v1/urls.py

@@ -4,14 +4,14 @@
 
 from __future__ import absolute_import, division, print_function, unicode_literals
 
-from django.urls import re_path
+from django.urls import path
 
 from . import views
 
 app_name = 'completion_aggregator'
 
 urlpatterns = [
-    re_path(r'^course/$', views.CompletionListView.as_view()),
-    re_path(r'^course/(?P<course_key>.+)/$', views.CompletionDetailView.as_view()),
-    re_path(r'^stats/(?P<course_key>.+)/$', views.CourseLevelCompletionStatsView.as_view()),
+    path('course/', views.CompletionListView.as_view()),
+    path('course/<path:course_key>/', views.CompletionDetailView.as_view()),
+    path('stats/<path:course_key>/', views.CourseLevelCompletionStatsView.as_view()),
 ]

completion_aggregator/urls.py

@@ -4,13 +4,13 @@
 """
 from __future__ import absolute_import, division, print_function, unicode_literals
 
-from django.urls import include, re_path
+from django.urls import include, path, re_path
 
 from . import views
 
 urlpatterns = [
-    re_path(r'^v1/', include('completion_aggregator.api.v1.urls', namespace='completion_api_v1')),
-    re_path(r'^v0/', include('completion_aggregator.api.v0.urls', namespace='completion_api_v0')),
+    path('v1/', include('completion_aggregator.api.v1.urls', namespace='completion_api_v1')),
+    path('v0/', include('completion_aggregator.api.v0.urls', namespace='completion_api_v0')),
     re_path(
         r'^progress_bar/(?P<course_key>[\w.@+:-]+)/$',
         views.CompletionProgressBarView.as_view(),

completion_aggregator/utils.py

@@ -3,7 +3,6 @@
 """
 from datetime import timezone
 
-import django
 from django.contrib.auth import get_user_model
 from django.utils.translation import gettext as _
 
@@ -42,8 +41,7 @@ def make_datetime_timezone_unaware(date):
     # pylint: disable=line-too-long
     # Ref: https://github.com/django/django/commit/e707e4c709c2e3f2dad69643eb838f87491891f8#diff-af003fcfed7cfbdeb396f8647ed0f92fR258
     # pylint: enable=line-too-long
-    if django.VERSION >= (1, 10):
-        date = date.astimezone(timezone.utc).replace(tzinfo=None)
+    date = date.astimezone(timezone.utc).replace(tzinfo=None)
     return date
 
 

test_urls.py

@@ -4,9 +4,9 @@
 """
 from __future__ import absolute_import, division, print_function, unicode_literals
 
-from django.urls import include, re_path
+from django.urls import include, path
 
 urlpatterns = [
-    re_path(r'^o/', include('oauth2_provider.urls', namespace='oauth2_provider')),
-    re_path(r'', include('completion_aggregator.urls')),
+    path('o/', include('oauth2_provider.urls', namespace='oauth2_provider')),
+    path('', include('completion_aggregator.urls')),
 ]

tests/test_views.py

@@ -490,7 +490,7 @@ def test_detail_view_oauth2(self, version):
         token = _create_oauth2_token(self.test_user)
         response = self.client.get(
             self.get_detail_url(version, self.course_key, username=self.test_user.username),
-            HTTP_AUTHORIZATION=f"Bearer {token}"
+            headers={"authorization": f"Bearer {token}"}
         )
         self.assertEqual(response.status_code, 200)
         if version == 0:
@@ -1124,7 +1124,7 @@ def test_create_view_oauth2(self, stub_submit):
 
         # Now, try with a valid token header:
         token = _create_oauth2_token(self.test_user)
-        response = self.client.post(self.update_url, {'completion': 1.0}, HTTP_AUTHORIZATION=f"Bearer {token}")
+        response = self.client.post(self.update_url, {'completion': 1.0}, headers={"authorization": f"Bearer {token}"})
         self.assertEqual(response.status_code, 201)
         stub_submit.assert_called_once()