Remove syntax for Python < 3.6

This change removes some remaining Python 2 and Python < 3.6 syntax. These
changes were applied with `pyupgrade --py36-plus`.

Author: BenSturmfels

profiling/construct_api_calls.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-#-*- coding:utf-8 -*-
 
 import os
 import sys

profiling/extract_api_calls.py

@@ -1,5 +1,4 @@
 #!/usr/bin/env python
-#-*- coding:utf-8 -*-
 
 import os
 import sys

requirements-to-freeze.txt

@@ -82,7 +82,6 @@ requests
 
 nose>=1.3.7
 django-nose
-mock
 mock_django
 responses
 django-debug-toolbar>3

requirements.txt

@@ -39,7 +39,6 @@ importlib-metadata==4.13.0
 jmespath==1.0.1
 kombu==5.2.4
 Markdown==2.6.11
-mock==5.0.1
 mock-django==0.6.10
 nose==1.3.7
 oauthlib==3.2.2

src/project/__init__.py

@@ -1,5 +1,3 @@
-
-
 # This will make sure the app is always imported when
 # Django starts so that shared_task will use this app.
 from .celery import app as celery_app

src/project/celery.py

@@ -1,5 +1,3 @@
-
-from __future__ import absolute_import, unicode_literals
 import os
 import sys
 from os.path import abspath, join

src/project/twinkie.py

@@ -1,5 +1,3 @@
-# -*- coding: utf-8 -*-
-
 from django.conf import settings
 from wsgiref.headers import Headers
 from wsgiref.handlers import format_date_time
@@ -9,7 +7,7 @@
 log = getLogger(__name__)
 
 
-class ExpiresMiddleware (object):
+class ExpiresMiddleware:
     """WSGI middleware that intercepts calls to the static files
     directory, as defined by the STATIC_URL setting, and serves those files.
     """

src/remote_client_user/middleware.py

@@ -52,7 +52,7 @@ def get_authed_user(request):
     return user
 
 
-class RemoteClientMiddleware(object):
+class RemoteClientMiddleware:
     def process_request(self, request):
         user = get_authed_user(request)
 

src/sa_api_v2/admin.py

@@ -78,7 +78,7 @@ def render(self, name, value, attrs=None):
             except ValueError:
                 # If we cannot, then we should still display the value
                 pass
-        return super(PrettyAceWidget, self).render(name, value, attrs=attrs)
+        return super().render(name, value, attrs=attrs)
 
 
 BaseGeoAdmin = admin.OSMGeoAdmin if settings.USE_GEODB else admin.ModelAdmin
@@ -98,14 +98,14 @@ def submitter_name(self, obj):
         return obj.submitter.username if obj.submitter else None
 
     def get_queryset(self, request):
-        qs = super(SubmittedThingAdmin, self).get_queryset(request)
+        qs = super().get_queryset(request)
         user = request.user
         if not user.is_superuser:
             qs = qs.filter(dataset__owner=user)
         return qs
 
     def get_form(self, request, obj=None, **kwargs):
-        FormWithJSONCleaning = super(SubmittedThingAdmin, self).get_form(request, obj=obj, **kwargs)
+        FormWithJSONCleaning = super().get_form(request, obj=obj, **kwargs)
 
         def clean_json_blob(form):
             data = form.cleaned_data['data']
@@ -223,7 +223,7 @@ class WebhookAdmin(admin.ModelAdmin):
     # list_filter = ('name',)
 
     def get_queryset(self, request):
-        qs = super(WebhookAdmin, self).get_queryset(request)
+        qs = super().get_queryset(request)
         user = request.user
         if not user.is_superuser:
             qs = qs.filter(dataset__owner=user)
@@ -246,7 +246,7 @@ def clear_cache(self, request, obj):
 
     def clone_dataset(self, request, obj):
         siblings = models.DataSet.objects.filter(owner=obj.owner)
-        slugs = set([ds.slug for ds in siblings])
+        slugs = {ds.slug for ds in siblings}
 
         for uniquifier in itertools.count(2):
             unique_slug = '-'.join([obj.slug, str(uniquifier)])
@@ -275,7 +275,7 @@ def api_path(self, instance):
     api_path.allow_tags = True
 
     def get_queryset(self, request):
-        qs = super(DataSetAdmin, self).get_queryset(request)
+        qs = super().get_queryset(request)
         user = request.user
         if not user.is_superuser:
             qs = qs.filter(owner=user)
@@ -286,7 +286,7 @@ def get_form(self, request, obj=None, **kwargs):
         # user should be assumed to be owned by themselves.
         if not request.user.is_superuser:
             self.exclude = (self.exclude or ()) + ('owner',)
-        return super(DataSetAdmin, self).get_form(request, obj, **kwargs)
+        return super().get_form(request, obj, **kwargs)
 
     def save_model(self, request, obj, form, change):
         # Set the current user as the owner if the object has no owner and the
@@ -295,7 +295,7 @@ def save_model(self, request, obj, form, change):
         if not user.is_superuser:
             if obj.owner_id is None:
                 obj.owner = user
-        super(DataSetAdmin, self).save_model(request, obj, form, change)
+        super().save_model(request, obj, form, change)
 
 
 class PlaceAdmin(SubmittedThingAdmin):
@@ -338,15 +338,15 @@ class ActionAdmin(admin.ModelAdmin):
 
     # Pre-Django 1.6
     def queryset(self, request):
-        qs = super(ActionAdmin, self).queryset(request)
+        qs = super().queryset(request)
         user = request.user
         if not user.is_superuser:
             qs = qs.filter(thing__dataset__owner=user)
         return qs.select_related('submitter', 'thing', 'thing__place')
 
     # Django 1.6+
     def get_queryset(self, request):
-        qs = super(ActionAdmin, self).get_queryset(request)
+        qs = super().get_queryset(request)
         user = request.user
         if not user.is_superuser:
             qs = qs.filter(thing__dataset__owner=user)
@@ -380,7 +380,7 @@ class Media:
         )
 
     def get_queryset(self, request):
-        qs = super(GroupAdmin, self).get_queryset(request)
+        qs = super().get_queryset(request)
         user = request.user
         if not user.is_superuser:
             qs = qs.filter(dataset__owner=user)
@@ -401,7 +401,7 @@ class UserAdmin(BaseUserAdmin):
     )
 
     def get_queryset(self, request):
-        qs = super(UserAdmin, self).get_queryset(request)
+        qs = super().get_queryset(request)
         user = request.user
         if not user.is_superuser:
             # Only show users that have contributed to the owner's datasets

src/sa_api_v2/apikey/admin.py

@@ -25,7 +25,7 @@ class Media:
         )
 
     def get_queryset(self, request):
-        qs = super(ApiKeyAdmin, self).get_queryset(request)
+        qs = super().get_queryset(request)
         user = request.user
         if not user.is_superuser:
             qs = qs.filter(dataset__owner=user)