diff --git a/openedx/features/announcements/apps.py b/openedx/features/announcements/apps.py index 6b410ff0f9..4bf964cae5 100644 --- a/openedx/features/announcements/apps.py +++ b/openedx/features/announcements/apps.py @@ -13,20 +13,20 @@ class AnnouncementsConfig(AppConfig): """ Application Configuration for Announcements """ - name = u'openedx.features.announcements' + name = 'openedx.features.announcements' plugin_app = { PluginURLs.CONFIG: { ProjectType.LMS: { - PluginURLs.NAMESPACE: u'announcements', - PluginURLs.REGEX: u'^announcements/', - PluginURLs.RELATIVE_PATH: u'urls', + PluginURLs.NAMESPACE: 'announcements', + PluginURLs.REGEX: '^announcements/', + PluginURLs.RELATIVE_PATH: 'urls', } }, PluginSettings.CONFIG: { ProjectType.LMS: { - SettingsType.COMMON: {PluginSettings.RELATIVE_PATH: u'settings.common'}, - SettingsType.TEST: {PluginSettings.RELATIVE_PATH: u'settings.test'}, + SettingsType.COMMON: {PluginSettings.RELATIVE_PATH: 'settings.common'}, + SettingsType.TEST: {PluginSettings.RELATIVE_PATH: 'settings.test'}, } } } diff --git a/openedx/features/announcements/migrations/0001_initial.py b/openedx/features/announcements/migrations/0001_initial.py index 79b46ba04b..c959b63490 100644 --- a/openedx/features/announcements/migrations/0001_initial.py +++ b/openedx/features/announcements/migrations/0001_initial.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- - - from django.db import migrations, models @@ -14,7 +11,7 @@ class Migration(migrations.Migration): name='Announcement', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('content', models.CharField(default=u'lorem ipsum', max_length=1000)), + ('content', models.CharField(default='lorem ipsum', max_length=1000)), ('active', models.BooleanField(default=True)), ], ), diff --git a/openedx/features/announcements/models.py b/openedx/features/announcements/models.py index 661b50d854..71aab7963a 100644 --- a/openedx/features/announcements/models.py +++ b/openedx/features/announcements/models.py @@ -10,10 +10,10 @@ from django.utils.encoding import python_2_unicode_compatible @python_2_unicode_compatible class Announcement(models.Model): """Site-wide announcements to be displayed on the dashboard""" - class Meta(object): + class Meta: app_label = 'announcements' - content = models.CharField(max_length=1000, null=False, default=u"lorem ipsum") + content = models.CharField(max_length=1000, null=False, default="lorem ipsum") active = models.BooleanField(default=True) def __str__(self): diff --git a/openedx/features/announcements/tests/test_announcements.py b/openedx/features/announcements/tests/test_announcements.py index c50ad80422..da1121e56e 100644 --- a/openedx/features/announcements/tests/test_announcements.py +++ b/openedx/features/announcements/tests/test_announcements.py @@ -5,7 +5,7 @@ Unit tests for the announcements feature. import json import unittest -from mock import patch +from unittest.mock import patch from django.conf import settings from django.test import TestCase @@ -13,7 +13,6 @@ from django.test.client import Client from django.urls import reverse from common.djangoapps.student.tests.factories import AdminFactory - from openedx.features.announcements.models import Announcement TEST_ANNOUNCEMENTS = [ @@ -33,14 +32,14 @@ class TestGlobalAnnouncements(TestCase): @classmethod def setUpTestData(cls): - super(TestGlobalAnnouncements, cls).setUpTestData() + super().setUpTestData() Announcement.objects.bulk_create([ Announcement(content=content, active=active) for content, active in TEST_ANNOUNCEMENTS ]) def setUp(self): - super(TestGlobalAnnouncements, self).setUp() # lint-amnesty, pylint: disable=super-with-arguments + super().setUp() self.client = Client() self.admin = AdminFactory.create( email='staff@edx.org',