diff --git a/cms/djangoapps/contentstore/courseware_index.py b/cms/djangoapps/contentstore/courseware_index.py index 2c15343c82..a73a0a9541 100644 --- a/cms/djangoapps/contentstore/courseware_index.py +++ b/cms/djangoapps/contentstore/courseware_index.py @@ -1,11 +1,12 @@ """ Code to allow module store to interface with courseware index """ - import logging import re from abc import ABCMeta, abstractmethod from datetime import timedelta +from contentstore.course_group_config import GroupConfiguration +from course_modes.models import CourseMode from django.conf import settings from django.urls import resolve from django.utils.translation import ugettext as _ @@ -13,14 +14,12 @@ from django.utils.translation import ugettext_lazy from eventtracking import tracker from search.search_engine_base import SearchEngine from six import add_metaclass, string_types, text_type - -from contentstore.course_group_config import GroupConfiguration -from course_modes.models import CourseMode -from openedx.core.lib.courses import course_image_url from xmodule.annotator_mixin import html_to_text from xmodule.library_tools import normalize_key_for_search from xmodule.modulestore import ModuleStoreEnum +from openedx.core.lib.courses import course_image_url + # REINDEX_AGE is the default amount of time that we look back for changes # that might have happened. If we are provided with a time at which the # indexing is triggered, then we know it is safe to only index items @@ -59,11 +58,10 @@ class SearchIndexingError(Exception): @add_metaclass(ABCMeta) -class SearchIndexerBase(object): +class SearchIndexerBase(object, metaclass=ABCMeta): """ Base class to perform indexing for courseware or library search from different modulestores """ - __metaclass__ = ABCMeta INDEX_NAME = None DOCUMENT_TYPE = None diff --git a/common/djangoapps/course_modes/migrations/0013_auto_20200115_2022.py b/common/djangoapps/course_modes/migrations/0013_auto_20200115_2022.py index bd33c71d01..3139133565 100644 --- a/common/djangoapps/course_modes/migrations/0013_auto_20200115_2022.py +++ b/common/djangoapps/course_modes/migrations/0013_auto_20200115_2022.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.27 on 2020-01-15 20:22 -from __future__ import unicode_literals -from django.db import migrations, models + import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/common/djangoapps/entitlements/migrations/0014_auto_20200115_2022.py b/common/djangoapps/entitlements/migrations/0014_auto_20200115_2022.py index f7fa755e30..0a13823b9e 100644 --- a/common/djangoapps/entitlements/migrations/0014_auto_20200115_2022.py +++ b/common/djangoapps/entitlements/migrations/0014_auto_20200115_2022.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.27 on 2020-01-15 20:22 -from __future__ import unicode_literals -from django.db import migrations, models + import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/common/djangoapps/entitlements/migrations/0015_add_unique_together_constraint.py b/common/djangoapps/entitlements/migrations/0015_add_unique_together_constraint.py index cb6b1e54ea..08919e28bd 100644 --- a/common/djangoapps/entitlements/migrations/0015_add_unique_together_constraint.py +++ b/common/djangoapps/entitlements/migrations/0015_add_unique_together_constraint.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.27 on 2020-01-29 10:33 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/common/djangoapps/student/migrations/0001_squashed_0031_auto_20200317_1122.py b/common/djangoapps/student/migrations/0001_squashed_0031_auto_20200317_1122.py index 22ef19f0c4..8b11daeffc 100644 --- a/common/djangoapps/student/migrations/0001_squashed_0031_auto_20200317_1122.py +++ b/common/djangoapps/student/migrations/0001_squashed_0031_auto_20200317_1122.py @@ -1,24 +1,23 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2020-04-13 17:34 -from __future__ import unicode_literals + + +import uuid import course_modes.models -from django.conf import settings -import django.core.validators -from django.db import migrations, models -import django.db.migrations.operations.special -import django.db.models.deletion import django.utils.timezone import django_countries.fields import model_utils.fields import opaque_keys.edx.django.models -import openedx.core.djangolib.model_mixins import simple_history.models -import uuid - +from django.conf import settings +from django.db import migrations, models from experiments.models import ExperimentData +from student.models import CourseEnrollment, FBEEnrollmentExclusion + +import openedx.core.djangolib.model_mixins from openedx.features.course_duration_limits.config import EXPERIMENT_DATA_HOLDBACK_KEY, EXPERIMENT_ID -from student.models import CourseAccessRole, CourseEnrollment, FBEEnrollmentExclusion + # These data migrations do not require changes when building from scratch. # student.migrations.0029_add_data_researcher diff --git a/common/djangoapps/student/migrations/0028_historicalmanualenrollmentaudit.py b/common/djangoapps/student/migrations/0028_historicalmanualenrollmentaudit.py index 9bf0d37d11..abf8df2d53 100644 --- a/common/djangoapps/student/migrations/0028_historicalmanualenrollmentaudit.py +++ b/common/djangoapps/student/migrations/0028_historicalmanualenrollmentaudit.py @@ -1,15 +1,14 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.27 on 2019-12-27 20:44 -from __future__ import unicode_literals -from django.conf import settings -from django.db import migrations, models + import django.db.models.deletion import simple_history.models +from django.conf import settings +from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), ('student', '0027_courseenrollment_mode_callable_default'), diff --git a/common/djangoapps/student/migrations/0029_add_data_researcher.py b/common/djangoapps/student/migrations/0029_add_data_researcher.py index d7347c7428..ecf4a8ef37 100644 --- a/common/djangoapps/student/migrations/0029_add_data_researcher.py +++ b/common/djangoapps/student/migrations/0029_add_data_researcher.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.27 on 2020-01-27 19:02 -from __future__ import unicode_literals + from django.db import migrations from student.models import CourseAccessRole diff --git a/common/djangoapps/student/migrations/0030_userprofile_phone_number.py b/common/djangoapps/student/migrations/0030_userprofile_phone_number.py index 7b7873f1ad..81732fc5f8 100644 --- a/common/djangoapps/student/migrations/0030_userprofile_phone_number.py +++ b/common/djangoapps/student/migrations/0030_userprofile_phone_number.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.28 on 2020-02-18 18:36 -from __future__ import unicode_literals + import django.core.validators from django.db import migrations, models diff --git a/common/djangoapps/student/migrations/0031_auto_20200317_1122.py b/common/djangoapps/student/migrations/0031_auto_20200317_1122.py index 26e37f5bed..4e9ba1866a 100644 --- a/common/djangoapps/student/migrations/0031_auto_20200317_1122.py +++ b/common/djangoapps/student/migrations/0031_auto_20200317_1122.py @@ -1,15 +1,13 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2020-03-17 11:22 -from __future__ import unicode_literals -from django.conf import settings -import django.core.validators -from django.db import migrations, models + import django.db.models.deletion +from django.conf import settings +from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), ('student', '0030_userprofile_phone_number'), diff --git a/common/djangoapps/student/migrations/0032_removed_logout_view_configuration.py b/common/djangoapps/student/migrations/0032_removed_logout_view_configuration.py index 02d52a8333..151968ead5 100644 --- a/common/djangoapps/student/migrations/0032_removed_logout_view_configuration.py +++ b/common/djangoapps/student/migrations/0032_removed_logout_view_configuration.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2020-03-25 14:28 -from __future__ import unicode_literals + from django.db import migrations diff --git a/common/djangoapps/third_party_auth/migrations/0025_auto_20200303_1448.py b/common/djangoapps/third_party_auth/migrations/0025_auto_20200303_1448.py index ce475b2b31..064216a5e4 100644 --- a/common/djangoapps/third_party_auth/migrations/0025_auto_20200303_1448.py +++ b/common/djangoapps/third_party_auth/migrations/0025_auto_20200303_1448.py @@ -1,8 +1,9 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.28 on 2020-03-03 14:48 -from __future__ import unicode_literals + from django.db import migrations, models + import openedx.core.lib.hash_utils diff --git a/common/djangoapps/track/migrations/0002_delete_trackinglog.py b/common/djangoapps/track/migrations/0002_delete_trackinglog.py index 3d59192f3d..463573e3fd 100644 --- a/common/djangoapps/track/migrations/0002_delete_trackinglog.py +++ b/common/djangoapps/track/migrations/0002_delete_trackinglog.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.27 on 2020-02-04 21:16 -from __future__ import unicode_literals + from django.db import migrations diff --git a/lms/djangoapps/course_home_api/outline/v1/tests/test_views.py b/lms/djangoapps/course_home_api/outline/v1/tests/test_views.py index 37cd8157f9..2ec68cf865 100644 --- a/lms/djangoapps/course_home_api/outline/v1/tests/test_views.py +++ b/lms/djangoapps/course_home_api/outline/v1/tests/test_views.py @@ -3,13 +3,12 @@ Tests for Outline Tab API in the Course Home API """ import ddt - -from django.urls import reverse - from course_modes.models import CourseMode -from lms.djangoapps.course_home_api.tests.utils import BaseCourseHomeTests +from django.urls import reverse from student.models import CourseEnrollment +from lms.djangoapps.course_home_api.tests.utils import BaseCourseHomeTests + @ddt.ddt class OutlineTabTestViews(BaseCourseHomeTests): @@ -30,7 +29,7 @@ class OutlineTabTestViews(BaseCourseHomeTests): course_tools = response.data.get('course_tools') self.assertTrue(course_tools) - self.assertEquals(course_tools[0]['analytics_id'], 'edx.bookmarks') + self.assertEqual(course_tools[0]['analytics_id'], 'edx.bookmarks') dates_widget = response.data.get('dates_widget') self.assertTrue(dates_widget) diff --git a/lms/djangoapps/courseware/migrations/0014_fix_nan_value_for_global_speed.py b/lms/djangoapps/courseware/migrations/0014_fix_nan_value_for_global_speed.py index e509936553..0d7beeb9bd 100644 --- a/lms/djangoapps/courseware/migrations/0014_fix_nan_value_for_global_speed.py +++ b/lms/djangoapps/courseware/migrations/0014_fix_nan_value_for_global_speed.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2020-03-11 10:07 -from __future__ import unicode_literals + from django.db import migrations diff --git a/lms/djangoapps/experiments/migrations/0004_historicalexperimentkeyvalue.py b/lms/djangoapps/experiments/migrations/0004_historicalexperimentkeyvalue.py index bc7f59b782..fafb354671 100644 --- a/lms/djangoapps/experiments/migrations/0004_historicalexperimentkeyvalue.py +++ b/lms/djangoapps/experiments/migrations/0004_historicalexperimentkeyvalue.py @@ -1,17 +1,15 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.28 on 2020-03-03 16:26 -from __future__ import unicode_literals -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion + import django.utils.timezone import model_utils.fields import simple_history.models +from django.conf import settings +from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), ('experiments', '0003_auto_20170713_1148'), diff --git a/lms/djangoapps/grades/migrations/0017_delete_manual_psgoverride_table.py b/lms/djangoapps/grades/migrations/0017_delete_manual_psgoverride_table.py index 180f7cd323..32671eae73 100644 --- a/lms/djangoapps/grades/migrations/0017_delete_manual_psgoverride_table.py +++ b/lms/djangoapps/grades/migrations/0017_delete_manual_psgoverride_table.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.27 on 2020-01-07 16:52 -from __future__ import unicode_literals + from django.db import migrations diff --git a/lms/djangoapps/program_enrollments/migrations/0009_update_course_enrollment_field_to_foreign_key.py b/lms/djangoapps/program_enrollments/migrations/0009_update_course_enrollment_field_to_foreign_key.py index 2e2111c8bd..7406258c60 100644 --- a/lms/djangoapps/program_enrollments/migrations/0009_update_course_enrollment_field_to_foreign_key.py +++ b/lms/djangoapps/program_enrollments/migrations/0009_update_course_enrollment_field_to_foreign_key.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.28 on 2020-02-26 21:20 -from __future__ import unicode_literals -from django.db import migrations, models + import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/lms/djangoapps/program_enrollments/migrations/0010_add_courseaccessroleassignment.py b/lms/djangoapps/program_enrollments/migrations/0010_add_courseaccessroleassignment.py index 2f0affb92b..5dc6907ec9 100644 --- a/lms/djangoapps/program_enrollments/migrations/0010_add_courseaccessroleassignment.py +++ b/lms/djangoapps/program_enrollments/migrations/0010_add_courseaccessroleassignment.py @@ -1,11 +1,10 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2020-03-25 19:28 -from __future__ import unicode_literals -from django.db import migrations, models -import django.db.models.deletion + import django.utils.timezone import model_utils.fields +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/lms/djangoapps/teams/migrations/0004_alter_defaults.py b/lms/djangoapps/teams/migrations/0004_alter_defaults.py index 4d660bf049..078deb5c32 100644 --- a/lms/djangoapps/teams/migrations/0004_alter_defaults.py +++ b/lms/djangoapps/teams/migrations/0004_alter_defaults.py @@ -1,15 +1,15 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2020-03-18 15:36 -from __future__ import unicode_literals -from django.db import migrations, models + import django_countries.fields -import lms.djangoapps.teams.models import student.models +from django.db import migrations, models + +import lms.djangoapps.teams.models class Migration(migrations.Migration): - dependencies = [ ('teams', '0003_courseteam_organization_protected'), ] diff --git a/openedx/core/djangoapps/content/course_overviews/migrations/0018_add_start_end_in_CourseOverview.py b/openedx/core/djangoapps/content/course_overviews/migrations/0018_add_start_end_in_CourseOverview.py index e3bf546c69..e02ad1b6df 100644 --- a/openedx/core/djangoapps/content/course_overviews/migrations/0018_add_start_end_in_CourseOverview.py +++ b/openedx/core/djangoapps/content/course_overviews/migrations/0018_add_start_end_in_CourseOverview.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.27 on 2020-01-13 13:55 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/openedx/core/djangoapps/content/course_overviews/migrations/0019_improve_courseoverviewtab.py b/openedx/core/djangoapps/content/course_overviews/migrations/0019_improve_courseoverviewtab.py index 70b729cc15..817078a89d 100644 --- a/openedx/core/djangoapps/content/course_overviews/migrations/0019_improve_courseoverviewtab.py +++ b/openedx/core/djangoapps/content/course_overviews/migrations/0019_improve_courseoverviewtab.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.27 on 2020-01-16 17:23 -from __future__ import unicode_literals -from django.db import migrations, models + import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/openedx/core/djangoapps/content/course_overviews/migrations/0020_courseoverviewtab_url_slug.py b/openedx/core/djangoapps/content/course_overviews/migrations/0020_courseoverviewtab_url_slug.py index d3ca00cbdf..a88351db8f 100644 --- a/openedx/core/djangoapps/content/course_overviews/migrations/0020_courseoverviewtab_url_slug.py +++ b/openedx/core/djangoapps/content/course_overviews/migrations/0020_courseoverviewtab_url_slug.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.28 on 2020-02-26 15:53 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/openedx/core/djangoapps/content_libraries/migrations/0002_group_permissions.py b/openedx/core/djangoapps/content_libraries/migrations/0002_group_permissions.py index f2bdeb7d76..3c7e3e6e5c 100644 --- a/openedx/core/djangoapps/content_libraries/migrations/0002_group_permissions.py +++ b/openedx/core/djangoapps/content_libraries/migrations/0002_group_permissions.py @@ -1,14 +1,13 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.26 on 2019-12-11 19:20 -from __future__ import unicode_literals + +import django.db.models.deletion from django.conf import settings from django.db import migrations, models -import django.db.models.deletion class Migration(migrations.Migration): - dependencies = [ ('auth', '0008_alter_user_username_max_length'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), diff --git a/openedx/core/djangoapps/course_date_signals/handlers.py b/openedx/core/djangoapps/course_date_signals/handlers.py index 69c6951121..1b04e3e6c6 100644 --- a/openedx/core/djangoapps/course_date_signals/handlers.py +++ b/openedx/core/djangoapps/course_date_signals/handlers.py @@ -1,16 +1,17 @@ """Signal handlers for writing course dates into edx_when.""" -from __future__ import absolute_import, unicode_literals + import logging from django.dispatch import receiver +from edx_when.api import FIELDS_TO_EXTRACT, set_dates_for_course from six import text_type from xblock.fields import Scope from xmodule.modulestore import ModuleStoreEnum from xmodule.modulestore.django import SignalHandler, modulestore + from .models import SelfPacedRelativeDatesConfig from .utils import spaced_out_sections -from edx_when.api import FIELDS_TO_EXTRACT, set_dates_for_course log = logging.getLogger(__name__) diff --git a/openedx/core/djangoapps/course_date_signals/migrations/0001_initial.py b/openedx/core/djangoapps/course_date_signals/migrations/0001_initial.py index 7efc61c9e3..20cdbfb229 100644 --- a/openedx/core/djangoapps/course_date_signals/migrations/0001_initial.py +++ b/openedx/core/djangoapps/course_date_signals/migrations/0001_initial.py @@ -1,15 +1,15 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.27 on 2020-02-03 21:22 -from __future__ import unicode_literals + +import django.db.models.deletion from django.conf import settings from django.db import migrations, models -import django.db.models.deletion + import openedx.core.djangoapps.config_model_utils.models class Migration(migrations.Migration): - initial = True dependencies = [ diff --git a/openedx/core/djangoapps/credit/migrations/0006_creditrequirement_alter_ordering.py b/openedx/core/djangoapps/credit/migrations/0006_creditrequirement_alter_ordering.py index 5c5bce1db2..d52d0338ec 100644 --- a/openedx/core/djangoapps/credit/migrations/0006_creditrequirement_alter_ordering.py +++ b/openedx/core/djangoapps/credit/migrations/0006_creditrequirement_alter_ordering.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.db import migrations diff --git a/openedx/core/djangoapps/credit/migrations/0007_creditrequirement_copy_values.py b/openedx/core/djangoapps/credit/migrations/0007_creditrequirement_copy_values.py index 6c843987be..28c6427803 100644 --- a/openedx/core/djangoapps/credit/migrations/0007_creditrequirement_copy_values.py +++ b/openedx/core/djangoapps/credit/migrations/0007_creditrequirement_copy_values.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.db import migrations diff --git a/openedx/core/djangoapps/credit/migrations/0008_creditrequirement_remove_order.py b/openedx/core/djangoapps/credit/migrations/0008_creditrequirement_remove_order.py index 0eb03ceb7f..b833886f50 100644 --- a/openedx/core/djangoapps/credit/migrations/0008_creditrequirement_remove_order.py +++ b/openedx/core/djangoapps/credit/migrations/0008_creditrequirement_remove_order.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.db import migrations diff --git a/openedx/core/djangoapps/external_user_ids/migrations/0001_initial.py b/openedx/core/djangoapps/external_user_ids/migrations/0001_initial.py index dce07f4b9a..4f63720592 100644 --- a/openedx/core/djangoapps/external_user_ids/migrations/0001_initial.py +++ b/openedx/core/djangoapps/external_user_ids/migrations/0001_initial.py @@ -1,18 +1,17 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.28 on 2020-02-10 17:53 -from __future__ import unicode_literals -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion + +import uuid + import django.utils.timezone import model_utils.fields import simple_history.models -import uuid +from django.conf import settings +from django.db import migrations, models class Migration(migrations.Migration): - initial = True dependencies = [ diff --git a/openedx/core/djangoapps/external_user_ids/migrations/0002_mb_coaching_20200210_1754.py b/openedx/core/djangoapps/external_user_ids/migrations/0002_mb_coaching_20200210_1754.py index e7f92d2bf2..d1654720c7 100644 --- a/openedx/core/djangoapps/external_user_ids/migrations/0002_mb_coaching_20200210_1754.py +++ b/openedx/core/djangoapps/external_user_ids/migrations/0002_mb_coaching_20200210_1754.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.28 on 2020-02-10 17:54 -from __future__ import unicode_literals + from django.db import migrations diff --git a/openedx/core/djangoapps/external_user_ids/migrations/0003_auto_20200224_1836.py b/openedx/core/djangoapps/external_user_ids/migrations/0003_auto_20200224_1836.py index a7db19f237..2e0b4a6405 100644 --- a/openedx/core/djangoapps/external_user_ids/migrations/0003_auto_20200224_1836.py +++ b/openedx/core/djangoapps/external_user_ids/migrations/0003_auto_20200224_1836.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.28 on 2020-02-24 18:36 -from __future__ import unicode_literals + from django.conf import settings from django.db import migrations diff --git a/openedx/core/djangoapps/oauth_dispatch/migrations/0008_applicationaccess_filters.py b/openedx/core/djangoapps/oauth_dispatch/migrations/0008_applicationaccess_filters.py index 55610a7e1e..991e64ce4d 100644 --- a/openedx/core/djangoapps/oauth_dispatch/migrations/0008_applicationaccess_filters.py +++ b/openedx/core/djangoapps/oauth_dispatch/migrations/0008_applicationaccess_filters.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.28 on 2020-02-14 21:30 -from __future__ import unicode_literals -from django.db import migrations, models + import django_mysql.models +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/openedx/core/djangoapps/oauth_dispatch/migrations/0009_delete_enable_scopes_waffle_switch.py b/openedx/core/djangoapps/oauth_dispatch/migrations/0009_delete_enable_scopes_waffle_switch.py index 7ada16230b..fe022ec4f7 100644 --- a/openedx/core/djangoapps/oauth_dispatch/migrations/0009_delete_enable_scopes_waffle_switch.py +++ b/openedx/core/djangoapps/oauth_dispatch/migrations/0009_delete_enable_scopes_waffle_switch.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.28 on 2020-03-04 15:19 -from __future__ import unicode_literals + """ Deletes the ENFORCE_JWT_SCOPES waffle switch that has already been deprecated and removed. diff --git a/openedx/core/djangoapps/schedules/migrations/0009_schedule_copy_column_values.py b/openedx/core/djangoapps/schedules/migrations/0009_schedule_copy_column_values.py index 5a66514ade..fa9f25e35d 100644 --- a/openedx/core/djangoapps/schedules/migrations/0009_schedule_copy_column_values.py +++ b/openedx/core/djangoapps/schedules/migrations/0009_schedule_copy_column_values.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.26 on 2019-11-24 20:52 -from __future__ import unicode_literals + from django.db import migrations, transaction diff --git a/openedx/core/djangoapps/schedules/migrations/0010_remove_null_blank_from_schedules_date.py b/openedx/core/djangoapps/schedules/migrations/0010_remove_null_blank_from_schedules_date.py index 735436acf2..3f580f794b 100644 --- a/openedx/core/djangoapps/schedules/migrations/0010_remove_null_blank_from_schedules_date.py +++ b/openedx/core/djangoapps/schedules/migrations/0010_remove_null_blank_from_schedules_date.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.26 on 2019-12-18 16:18 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/openedx/core/djangoapps/schedules/migrations/0011_auto_20200228_2018.py b/openedx/core/djangoapps/schedules/migrations/0011_auto_20200228_2018.py index 28a87e1e4a..2b68df16ba 100644 --- a/openedx/core/djangoapps/schedules/migrations/0011_auto_20200228_2018.py +++ b/openedx/core/djangoapps/schedules/migrations/0011_auto_20200228_2018.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.28 on 2020-02-28 20:18 -from __future__ import unicode_literals -from django.db import migrations, models + import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/openedx/core/djangoapps/schedules/migrations/0012_auto_20200302_1914.py b/openedx/core/djangoapps/schedules/migrations/0012_auto_20200302_1914.py index 3cceb10d70..f82f7f3682 100644 --- a/openedx/core/djangoapps/schedules/migrations/0012_auto_20200302_1914.py +++ b/openedx/core/djangoapps/schedules/migrations/0012_auto_20200302_1914.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.28 on 2020-03-02 19:14 -from __future__ import unicode_literals -from django.db import migrations, models + import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/openedx/core/djangoapps/schedules/migrations/0013_historicalschedule.py b/openedx/core/djangoapps/schedules/migrations/0013_historicalschedule.py index e60df25e46..8fc49d168b 100644 --- a/openedx/core/djangoapps/schedules/migrations/0013_historicalschedule.py +++ b/openedx/core/djangoapps/schedules/migrations/0013_historicalschedule.py @@ -1,17 +1,15 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.28 on 2020-03-03 18:36 -from __future__ import unicode_literals -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion + import django.utils.timezone import model_utils.fields import simple_history.models +from django.conf import settings +from django.db import migrations, models class Migration(migrations.Migration): - dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), ('schedules', '0012_auto_20200302_1914'), diff --git a/openedx/core/djangoapps/schedules/migrations/0014_historicalschedule_drop_fk.py b/openedx/core/djangoapps/schedules/migrations/0014_historicalschedule_drop_fk.py index dfbcb6431b..3c2eabf554 100644 --- a/openedx/core/djangoapps/schedules/migrations/0014_historicalschedule_drop_fk.py +++ b/openedx/core/djangoapps/schedules/migrations/0014_historicalschedule_drop_fk.py @@ -1,14 +1,13 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.28 on 2020-03-09 17:02 -from __future__ import unicode_literals + +import django.db.models.deletion from django.conf import settings from django.db import migrations, models -import django.db.models.deletion class Migration(migrations.Migration): - dependencies = [ ('schedules', '0013_historicalschedule'), ] diff --git a/openedx/core/djangoapps/schedules/migrations/0015_schedules_start_nullable.py b/openedx/core/djangoapps/schedules/migrations/0015_schedules_start_nullable.py index ccf10aa79a..e28df77c58 100644 --- a/openedx/core/djangoapps/schedules/migrations/0015_schedules_start_nullable.py +++ b/openedx/core/djangoapps/schedules/migrations/0015_schedules_start_nullable.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.28 on 2020-03-04 21:49 -from __future__ import unicode_literals + from django.db import migrations, models diff --git a/openedx/core/djangoapps/schedules/migrations/0016_remove_start_from_schedules.py b/openedx/core/djangoapps/schedules/migrations/0016_remove_start_from_schedules.py index fbbee57218..43b68216a1 100644 --- a/openedx/core/djangoapps/schedules/migrations/0016_remove_start_from_schedules.py +++ b/openedx/core/djangoapps/schedules/migrations/0016_remove_start_from_schedules.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.27 on 2020-01-07 18:46 -from __future__ import unicode_literals + from django.db import migrations diff --git a/openedx/core/djangoapps/schedules/migrations/0017_remove_start_from_historicalschedule.py b/openedx/core/djangoapps/schedules/migrations/0017_remove_start_from_historicalschedule.py index fb936df94a..38181ab3da 100644 --- a/openedx/core/djangoapps/schedules/migrations/0017_remove_start_from_historicalschedule.py +++ b/openedx/core/djangoapps/schedules/migrations/0017_remove_start_from_historicalschedule.py @@ -1,14 +1,11 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.28 on 2020-03-12 20:29 -from __future__ import unicode_literals -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion + +from django.db import migrations class Migration(migrations.Migration): - dependencies = [ ('schedules', '0016_remove_start_from_schedules'), ] diff --git a/openedx/core/djangoapps/schedules/migrations/0018_readd_historicalschedule_fks.py b/openedx/core/djangoapps/schedules/migrations/0018_readd_historicalschedule_fks.py index 66d1f5a8ba..c5fd3a36c0 100644 --- a/openedx/core/djangoapps/schedules/migrations/0018_readd_historicalschedule_fks.py +++ b/openedx/core/djangoapps/schedules/migrations/0018_readd_historicalschedule_fks.py @@ -1,14 +1,13 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.28 on 2020-03-16 14:00 -from __future__ import unicode_literals + +import django.db.models.deletion from django.conf import settings from django.db import migrations, models -import django.db.models.deletion class Migration(migrations.Migration): - dependencies = [ ('schedules', '0017_remove_start_from_historicalschedule'), ] diff --git a/openedx/core/djangoapps/schedules/migrations/0019_auto_20200316_1935.py b/openedx/core/djangoapps/schedules/migrations/0019_auto_20200316_1935.py index ea0cb24f78..ec29135381 100644 --- a/openedx/core/djangoapps/schedules/migrations/0019_auto_20200316_1935.py +++ b/openedx/core/djangoapps/schedules/migrations/0019_auto_20200316_1935.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.28 on 2020-03-16 19:35 -from __future__ import unicode_literals -from django.db import migrations, models + import django.db.models.deletion +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/openedx/core/djangoapps/site_configuration/management/commands/create_or_update_site_configuration.py b/openedx/core/djangoapps/site_configuration/management/commands/create_or_update_site_configuration.py index 3fc92844b9..f891984f20 100644 --- a/openedx/core/djangoapps/site_configuration/management/commands/create_or_update_site_configuration.py +++ b/openedx/core/djangoapps/site_configuration/management/commands/create_or_update_site_configuration.py @@ -1,7 +1,6 @@ """ Create or updates the SiteConfiguration for a site. """ -from __future__ import absolute_import, unicode_literals import codecs import json @@ -10,7 +9,6 @@ import logging from django.contrib.sites.models import Site from django.core.management import BaseCommand - from openedx.core.djangoapps.site_configuration.models import SiteConfiguration LOG = logging.getLogger(__name__) diff --git a/openedx/core/djangoapps/site_configuration/management/commands/tests/test_create_or_update_site_configuration.py b/openedx/core/djangoapps/site_configuration/management/commands/tests/test_create_or_update_site_configuration.py index 9a686ae0cd..3ac489bed1 100644 --- a/openedx/core/djangoapps/site_configuration/management/commands/tests/test_create_or_update_site_configuration.py +++ b/openedx/core/djangoapps/site_configuration/management/commands/tests/test_create_or_update_site_configuration.py @@ -1,7 +1,6 @@ """ Tests for the create_or_update_site_configuration management command. """ -from __future__ import absolute_import, unicode_literals import codecs import json diff --git a/openedx/core/djangoapps/site_configuration/migrations/0003_auto_20200217_1058.py b/openedx/core/djangoapps/site_configuration/migrations/0003_auto_20200217_1058.py index 3380ff1ebd..8a7394f32a 100644 --- a/openedx/core/djangoapps/site_configuration/migrations/0003_auto_20200217_1058.py +++ b/openedx/core/djangoapps/site_configuration/migrations/0003_auto_20200217_1058.py @@ -1,11 +1,11 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.28 on 2020-02-17 10:58 -from __future__ import unicode_literals + import collections -from django.db import migrations -import jsonfield.encoder + import jsonfield.fields +from django.db import migrations class Migration(migrations.Migration): diff --git a/openedx/core/djangoapps/site_configuration/migrations/0004_add_site_values_field.py b/openedx/core/djangoapps/site_configuration/migrations/0004_add_site_values_field.py index fc13fff806..2efdd1bebd 100644 --- a/openedx/core/djangoapps/site_configuration/migrations/0004_add_site_values_field.py +++ b/openedx/core/djangoapps/site_configuration/migrations/0004_add_site_values_field.py @@ -1,11 +1,11 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.28 on 2020-02-19 16:50 -from __future__ import unicode_literals + import collections -from django.db import migrations -import jsonfield.encoder + import jsonfield.fields +from django.db import migrations class Migration(migrations.Migration): diff --git a/openedx/core/djangoapps/site_configuration/migrations/0005_populate_siteconfig_history_site_values.py b/openedx/core/djangoapps/site_configuration/migrations/0005_populate_siteconfig_history_site_values.py index b117380d5b..bf7254ca7e 100644 --- a/openedx/core/djangoapps/site_configuration/migrations/0005_populate_siteconfig_history_site_values.py +++ b/openedx/core/djangoapps/site_configuration/migrations/0005_populate_siteconfig_history_site_values.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.db import migrations diff --git a/openedx/core/djangoapps/site_configuration/migrations/0006_copy_values_to_site_values.py b/openedx/core/djangoapps/site_configuration/migrations/0006_copy_values_to_site_values.py index c7c046f828..c5c890fd6d 100644 --- a/openedx/core/djangoapps/site_configuration/migrations/0006_copy_values_to_site_values.py +++ b/openedx/core/djangoapps/site_configuration/migrations/0006_copy_values_to_site_values.py @@ -1,10 +1,11 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.db import migrations from ..models import save_siteconfig_without_historical_record + def copy_column_values(apps, schema_editor): """ Copy the contents of the values field into the site_values field in both diff --git a/openedx/core/djangoapps/site_configuration/migrations/0007_remove_values_field.py b/openedx/core/djangoapps/site_configuration/migrations/0007_remove_values_field.py index 4b7425f5ad..aef07b728a 100644 --- a/openedx/core/djangoapps/site_configuration/migrations/0007_remove_values_field.py +++ b/openedx/core/djangoapps/site_configuration/migrations/0007_remove_values_field.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals + from django.db import migrations diff --git a/openedx/core/process_warnings.py b/openedx/core/process_warnings.py index e0b0fd37f8..2da127b5cd 100644 --- a/openedx/core/process_warnings.py +++ b/openedx/core/process_warnings.py @@ -1,14 +1,13 @@ """ Script to process pytest warnings output by pytest-json-report plugin and output it as a html """ -from __future__ import absolute_import -from __future__ import print_function -import json -import os + +import argparse import io import itertools +import json +import os import re -import argparse from collections import Counter from write_to_html import ( diff --git a/openedx/features/calendar_sync/migrations/0001_initial.py b/openedx/features/calendar_sync/migrations/0001_initial.py index 317179a620..666152e776 100644 --- a/openedx/features/calendar_sync/migrations/0001_initial.py +++ b/openedx/features/calendar_sync/migrations/0001_initial.py @@ -1,16 +1,15 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.28 on 2020-02-20 20:20 -from __future__ import unicode_literals -from django.conf import settings -from django.db import migrations, models + import django.db.models.deletion import opaque_keys.edx.django.models import simple_history.models +from django.conf import settings +from django.db import migrations, models class Migration(migrations.Migration): - initial = True dependencies = [