diff --git a/openedx/core/djangoapps/debug/views.py b/openedx/core/djangoapps/debug/views.py index 37531ce46b..3554e938a1 100644 --- a/openedx/core/djangoapps/debug/views.py +++ b/openedx/core/djangoapps/debug/views.py @@ -27,7 +27,7 @@ def show_reference_template(request, template): e.g. /template/ux/reference/index.html?name=Foo """ try: - is_v1 = u'/v1/' in request.path + is_v1 = '/v1/' in request.path uses_bootstrap = not is_v1 context = { 'request': request, @@ -46,7 +46,7 @@ def show_reference_template(request, template): PageLevelMessages.register_error_message(request, request.GET.get('error')) # Add some messages to the course skeleton pages - if u'course-skeleton.html' in request.path: + if 'course-skeleton.html' in request.path: PageLevelMessages.register_info_message(request, _('This is a test message')) PageLevelMessages.register_success_message(request, _('This is a success message')) PageLevelMessages.register_warning_message(request, _('This is a test warning')) @@ -54,4 +54,4 @@ def show_reference_template(request, template): return render_to_response(template, context) except TemplateDoesNotExist: - return HttpResponseNotFound(u'Missing template {template}'.format(template=bleach.clean(template, strip=True))) + return HttpResponseNotFound('Missing template {template}'.format(template=bleach.clean(template, strip=True))) diff --git a/openedx/core/djangoapps/demographics/admin.py b/openedx/core/djangoapps/demographics/admin.py index 5085e0c04a..115581a7fb 100644 --- a/openedx/core/djangoapps/demographics/admin.py +++ b/openedx/core/djangoapps/demographics/admin.py @@ -15,7 +15,7 @@ class UserDemographicsAdmin(admin.ModelAdmin): readonly_fields = ('user',) search_fields = ('id', 'user__username') - class Meta(object): + class Meta: model = UserDemographics diff --git a/openedx/core/djangoapps/demographics/models.py b/openedx/core/djangoapps/demographics/models.py index 2aef94980b..2ed7980285 100644 --- a/openedx/core/djangoapps/demographics/models.py +++ b/openedx/core/djangoapps/demographics/models.py @@ -16,10 +16,10 @@ class UserDemographics(TimeStampedModel): show_call_to_action = models.BooleanField(default=True) history = HistoricalRecords(app='demographics') - class Meta(object): + class Meta: app_label = "demographics" verbose_name = "user demographic" verbose_name_plural = "user demographic" def __str__(self): - return 'UserDemographics for {}'.format(self.user) + return f'UserDemographics for {self.user}' diff --git a/openedx/core/djangoapps/demographics/tests/factories.py b/openedx/core/djangoapps/demographics/tests/factories.py index ddfdcf7698..9678eaec6d 100644 --- a/openedx/core/djangoapps/demographics/tests/factories.py +++ b/openedx/core/djangoapps/demographics/tests/factories.py @@ -12,5 +12,5 @@ class UserDemographicsFactory(factory.django.DjangoModelFactory): UserDemographics Factory """ - class Meta(object): + class Meta: model = UserDemographics diff --git a/openedx/core/djangoapps/demographics/tests/test_status.py b/openedx/core/djangoapps/demographics/tests/test_status.py index 013ad71404..10918b61c2 100644 --- a/openedx/core/djangoapps/demographics/tests/test_status.py +++ b/openedx/core/djangoapps/demographics/tests/test_status.py @@ -1,7 +1,7 @@ """ Test status utilities """ -import mock +from unittest import mock from django.conf import settings from pytest import mark @@ -59,7 +59,7 @@ class TestShowDemographics(SharedModuleStoreTestCase): # lint-amnesty, pylint: @mark.django_db class TestShowCallToAction(TestCase): # lint-amnesty, pylint: disable=missing-class-docstring def setUp(self): - super(TestShowCallToAction, self).setUp() # lint-amnesty, pylint: disable=super-with-arguments + super().setUp() self.user = UserFactory() def test_new_user(self): diff --git a/openedx/core/djangoapps/discussions/models.py b/openedx/core/djangoapps/discussions/models.py index f4e0067c4b..4d496ddd9d 100644 --- a/openedx/core/djangoapps/discussions/models.py +++ b/openedx/core/djangoapps/discussions/models.py @@ -23,7 +23,7 @@ from openedx.core.djangoapps.content.course_overviews.models import CourseOvervi log = logging.getLogger(__name__) -def get_supported_providers() -> List[str]: +def get_supported_providers() -> list[str]: """ Return the list of supported discussion providers @@ -96,7 +96,7 @@ class ProviderFilter(StackedConfigurationModel): ) @property - def available_providers(self) -> List[str]: + def available_providers(self) -> list[str]: """ Return a filtered list of available providers """ @@ -116,7 +116,7 @@ class ProviderFilter(StackedConfigurationModel): return _providers @classmethod - def get_available_providers(cls, course_key: CourseKey) -> List[str]: + def get_available_providers(cls, course_key: CourseKey) -> list[str]: _filter = cls.current(course_key=course_key) providers = _filter.available_providers return providers @@ -202,9 +202,9 @@ class DiscussionsConfiguration(TimeStampedModel): # pylint: enable=undefined-variable @property - def available_providers(self) -> List[str]: + def available_providers(self) -> list[str]: return ProviderFilter.current(course_key=self.context_key).available_providers @classmethod - def get_available_providers(cls, context_key: CourseKey) -> List[str]: + def get_available_providers(cls, context_key: CourseKey) -> list[str]: return ProviderFilter.current(course_key=context_key).available_providers