refactor: Ran pyupgrade on openedx/core/djangoapps (#26936)

openedx/core/djangoapps/external_user_ids/admin.py

@@ -32,7 +32,7 @@ class ExternalIdAdmin(admin.ModelAdmin):  # lint-amnesty, pylint: disable=missin
     template = 'openedx/core/djangoapps/external_user_ids/templates/admin/generate_external_ids_template.html'
 
     def get_urls(self):
-        urls = super(ExternalIdAdmin, self).get_urls()  # lint-amnesty, pylint: disable=super-with-arguments
+        urls = super().get_urls()
         custom_urls = [
             url(
                 r'^bulk_generate_external_ids/$',
@@ -44,10 +44,10 @@ class ExternalIdAdmin(admin.ModelAdmin):  # lint-amnesty, pylint: disable=missin
 
     def _generate_results_msg(self, user_id_list, unknown_users, created_id_list, existing_id):
         return (
-            'Attempted to create for: {}\n'.format(user_id_list) +
-            'Could not find: {}\n'.format(unknown_users) +
-            'Created External IDs for: {}\n'.format(created_id_list) +
-            'External IDs already exist for: {}\n'.format(existing_id)
+            f'Attempted to create for: {user_id_list}\n' +
+            f'Could not find: {unknown_users}\n' +
+            f'Created External IDs for: {created_id_list}\n' +
+            f'External IDs already exist for: {existing_id}\n'
         )
 
     def process_generate_ids_request(self, user_id_list, id_type, request, redirect_url):  # lint-amnesty, pylint: disable=missing-function-docstring

openedx/core/djangoapps/external_user_ids/migrations/0001_initial.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.11.28 on 2020-02-10 17:53
 
 

openedx/core/djangoapps/external_user_ids/migrations/0002_mb_coaching_20200210_1754.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.11.28 on 2020-02-10 17:54
 
 

openedx/core/djangoapps/external_user_ids/migrations/0003_auto_20200224_1836.py

@@ -1,4 +1,3 @@
-# -*- coding: utf-8 -*-
 # Generated by Django 1.11.28 on 2020-02-24 18:36
 
 
@@ -16,6 +15,6 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AlterUniqueTogether(
             name='externalid',
-            unique_together=set([('user', 'external_id_type')]),
+            unique_together={('user', 'external_id_type')},
         ),
     ]

openedx/core/djangoapps/external_user_ids/models.py

@@ -49,7 +49,7 @@ class ExternalId(TimeStampedModel):
     user = models.ForeignKey(User, db_index=True, on_delete=models.CASCADE)
     history = HistoricalRecords()
 
-    class Meta(object):
+    class Meta:
         unique_together = (('user', 'external_id_type'),)
         app_label = 'external_user_ids'
 

openedx/core/djangoapps/external_user_ids/tests/factories.py

@@ -11,7 +11,7 @@ from openedx.core.djangoapps.external_user_ids.models import ExternalId, Externa
 
 
 class ExternalIDTypeFactory(factory.django.DjangoModelFactory):  # lint-amnesty, pylint: disable=missing-class-docstring
-    class Meta(object):
+    class Meta:
         model = ExternalIdType
 
     name = FuzzyChoice([ExternalIdType.MICROBACHELORS_COACHING])
@@ -19,7 +19,7 @@ class ExternalIDTypeFactory(factory.django.DjangoModelFactory):  # lint-amnesty,
 
 
 class ExternalIdFactory(factory.django.DjangoModelFactory):  # lint-amnesty, pylint: disable=missing-class-docstring
-    class Meta(object):
+    class Meta:
         model = ExternalId
 
     external_user_id = factory.LazyFunction(uuid4)

openedx/core/djangoapps/external_user_ids/tests/test_admin_generate_id.py

@@ -1,7 +1,7 @@
 """
 Test the logic behind the Generate External IDs tools in Admin
 """
-import mock
+from unittest import mock
 from django.contrib.admin.sites import AdminSite
 from django.test import TestCase
 from common.djangoapps.student.tests.factories import UserFactory
@@ -18,7 +18,7 @@ class TestGenerateExternalIds(TestCase):
     Test generating ExternalIDs for Users.
     """
     def setUp(self):
-        super(TestGenerateExternalIds, self).setUp()  # lint-amnesty, pylint: disable=super-with-arguments
+        super().setUp()
         self.users = UserFactory.create_batch(10)
         self.user_id_list = [user.id for user in self.users]
         self.external_id_admin = ExternalIdAdmin(ExternalId, AdminSite())

openedx/core/djangoapps/external_user_ids/tests/test_signals.py

@@ -33,7 +33,7 @@ class MicrobachelorsExternalIDTest(ModuleStoreTestCase, CacheIsolationTestCase):
 
     @classmethod
     def setUpClass(cls):
-        super(MicrobachelorsExternalIDTest, cls).setUpClass()
+        super().setUpClass()
 
         cls.course_list = []
         cls.user = UserFactory.create()
@@ -47,7 +47,7 @@ class MicrobachelorsExternalIDTest(ModuleStoreTestCase, CacheIsolationTestCase):
         )
 
     def setUp(self):
-        super(MicrobachelorsExternalIDTest, self).setUp()  # lint-amnesty, pylint: disable=super-with-arguments
+        super().setUp()
         RequestCache.clear_all_namespaces()
         self.program = self._create_cached_program()
         self.client.login(username=self.user.username, password=TEST_PASSWORD)

openedx/core/djangoapps/geoinfo/middleware.py

@@ -46,5 +46,5 @@ class CountryMiddleware(MiddlewareMixin):
 
             request.session['country_code'] = country_code
             request.session['ip_address'] = new_ip_address
-            log.debug(u'Country code for IP: %s is set to %s', new_ip_address, country_code)
+            log.debug('Country code for IP: %s is set to %s', new_ip_address, country_code)
             reader.close()

openedx/core/djangoapps/geoinfo/tests/test_middleware.py

@@ -3,12 +3,13 @@ Tests for CountryMiddleware.
 """
 
 
+from unittest.mock import MagicMock, PropertyMock, patch
+
 import geoip2
 import maxminddb
 from django.contrib.sessions.middleware import SessionMiddleware
 from django.test import TestCase
 from django.test.client import RequestFactory
-from mock import MagicMock, PropertyMock, patch
 
 from openedx.core.djangoapps.geoinfo.middleware import CountryMiddleware
 from common.djangoapps.student.tests.factories import AnonymousUserFactory, UserFactory
@@ -19,7 +20,7 @@ class CountryMiddlewareTests(TestCase):
     Tests of CountryMiddleware.
     """
     def setUp(self):
-        super(CountryMiddlewareTests, self).setUp()  # lint-amnesty, pylint: disable=super-with-arguments
+        super().setUp()
         self.country_middleware = CountryMiddleware()
         self.session_middleware = SessionMiddleware()
         self.authenticated_user = UserFactory.create()

openedx/core/djangoapps/header_control/middleware.py

@@ -3,7 +3,6 @@ Middleware used for adjusting headers in a response before it is sent to the end
 """
 
 from django.utils.deprecation import MiddlewareMixin
-import six
 
 
 class HeaderControlMiddleware(MiddlewareMixin):
@@ -21,7 +20,7 @@ class HeaderControlMiddleware(MiddlewareMixin):
         for header in getattr(response, 'remove_headers', []):
             del response[header]
 
-        for header, value in six.iteritems(getattr(response, 'force_headers', {})):
+        for header, value in getattr(response, 'force_headers', {}).items():
             response[header] = value
 
         return response

openedx/core/djangoapps/header_control/tests/test_middleware.py

@@ -11,7 +11,7 @@ from openedx.core.djangoapps.header_control.middleware import HeaderControlMiddl
 class TestHeaderControlMiddlewareProcessResponse(TestCase):
     """Test the `header_control` middleware. """
     def setUp(self):
-        super(TestHeaderControlMiddlewareProcessResponse, self).setUp()  # lint-amnesty, pylint: disable=super-with-arguments
+        super().setUp()
         self.middleware = HeaderControlMiddleware()
 
     def test_doesnt_barf_if_not_modifying_anything(self):