From 8bef10208af04b00479f6fb18f45bf3d1599033d Mon Sep 17 00:00:00 2001 From: Awais Qureshi Date: Tue, 23 Feb 2021 14:55:02 +0500 Subject: [PATCH] BOM-2375 Run Pyupgrade on student folder. --- .../student/migrations/0001_initial.py | 35 +++++++++---------- .../0001_squashed_0031_auto_20200317_1122.py | 20 +++++------ .../migrations/0002_auto_20151208_1034.py | 7 ++-- .../migrations/0003_auto_20160516_0938.py | 5 +-- .../migrations/0004_auto_20160531_1422.py | 3 -- .../migrations/0005_auto_20160531_1653.py | 3 -- .../0006_logoutviewconfiguration.py | 3 -- .../0007_registrationcookieconfiguration.py | 3 -- .../migrations/0008_auto_20161117_1209.py | 5 +-- .../migrations/0009_auto_20170111_0422.py | 3 -- .../migrations/0010_auto_20170207_0458.py | 3 -- .../0011_course_key_field_to_foreign_key.py | 5 +-- .../student/migrations/0012_sociallink.py | 3 -- ...13_delete_historical_enrollment_records.py | 3 -- .../0014_courseenrollmentallowed_user.py | 3 -- .../0015_manualenrollmentaudit_add_role.py | 3 -- ...senrollment_course_on_delete_do_nothing.py | 1 - .../migrations/0017_accountrecovery.py | 1 - .../0018_remove_password_history.py | 1 - .../migrations/0019_auto_20181221_0540.py | 3 +- .../migrations/0020_auto_20190227_2019.py | 1 - .../0021_historicalcourseenrollment.py | 3 +- .../0022_indexing_in_courseenrollment.py | 1 - .../0023_bulkunenrollconfiguration.py | 7 ++-- .../migrations/0024_fbeenrollmentexclusion.py | 3 +- .../migrations/0025_auto_20191101_1846.py | 3 +- .../migrations/0026_allowedauthuser.py | 3 +- ..._courseenrollment_mode_callable_default.py | 1 - .../0028_historicalmanualenrollmentaudit.py | 1 - .../migrations/0029_add_data_researcher.py | 2 +- .../0030_userprofile_phone_number.py | 1 - .../migrations/0031_auto_20200317_1122.py | 1 - .../0032_removed_logout_view_configuration.py | 1 - .../0034_courseenrollmentcelebration.py | 2 +- .../0035_bulkchangeenrollmentconfiguration.py | 4 +-- .../0036_userpasswordtogglehistory.py | 4 +-- .../migrations/0039_anon_id_context.py | 2 +- .../migrations/0040_usercelebration.py | 4 +-- 38 files changed, 47 insertions(+), 110 deletions(-) diff --git a/common/djangoapps/student/migrations/0001_initial.py b/common/djangoapps/student/migrations/0001_initial.py index fbb2de5736..6cabce5cdd 100644 --- a/common/djangoapps/student/migrations/0001_initial.py +++ b/common/djangoapps/student/migrations/0001_initial.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- - - import django.db.models.deletion import django.utils.timezone import django_countries.fields @@ -75,7 +72,7 @@ class Migration(migrations.Migration): ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('change_date', models.DateTimeField(auto_now_add=True, verbose_name='Change date')), ('enabled', models.BooleanField(default=False, verbose_name='Enabled')), - ('recent_enrollment_time_delta', models.PositiveIntegerField(default=0, help_text=u"The number of seconds in which a new enrollment is considered 'recent'. Used to display notifications.")), + ('recent_enrollment_time_delta', models.PositiveIntegerField(default=0, help_text="The number of seconds in which a new enrollment is considered 'recent'. Used to display notifications.")), ('changed_by', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, editable=False, to=settings.AUTH_USER_MODEL, null=True, verbose_name='Changed by')), ], options={ @@ -141,9 +138,9 @@ class Migration(migrations.Migration): ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('change_date', models.DateTimeField(auto_now_add=True, verbose_name='Change date')), ('enabled', models.BooleanField(default=False, verbose_name='Enabled')), - ('company_identifier', models.TextField(help_text=u'The company identifier for the LinkedIn Add-to-Profile button e.g 0_0dPSPyS070e0HsE9HNz_13_d11_')), - ('dashboard_tracking_code', models.TextField(default=u'', blank=True)), - ('trk_partner_name', models.CharField(default=u'', help_text=u"Short identifier for the LinkedIn partner used in the tracking code. (Example: 'edx') If no value is provided, tracking codes will not be sent to LinkedIn.", max_length=10, blank=True)), + ('company_identifier', models.TextField(help_text='The company identifier for the LinkedIn Add-to-Profile button e.g 0_0dPSPyS070e0HsE9HNz_13_d11_')), + ('dashboard_tracking_code', models.TextField(default='', blank=True)), + ('trk_partner_name', models.CharField(default='', help_text="Short identifier for the LinkedIn partner used in the tracking code. (Example: 'edx') If no value is provided, tracking codes will not be sent to LinkedIn.", max_length=10, blank=True)), ('changed_by', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, editable=False, to=settings.AUTH_USER_MODEL, null=True, verbose_name='Changed by')), ], options={ @@ -166,7 +163,7 @@ class Migration(migrations.Migration): ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('enrolled_email', models.CharField(max_length=255, db_index=True)), ('time_stamp', models.DateTimeField(auto_now_add=True, null=True)), - ('state_transition', models.CharField(max_length=255, choices=[(u'from unenrolled to allowed to enroll', u'from unenrolled to allowed to enroll'), (u'from allowed to enroll to enrolled', u'from allowed to enroll to enrolled'), (u'from enrolled to enrolled', u'from enrolled to enrolled'), (u'from enrolled to unenrolled', u'from enrolled to unenrolled'), (u'from unenrolled to enrolled', u'from unenrolled to enrolled'), (u'from allowed to enroll to enrolled', u'from allowed to enroll to enrolled'), (u'from unenrolled to unenrolled', u'from unenrolled to unenrolled'), (u'N/A', u'N/A')])), + ('state_transition', models.CharField(max_length=255, choices=[('from unenrolled to allowed to enroll', 'from unenrolled to allowed to enroll'), ('from allowed to enroll to enrolled', 'from allowed to enroll to enrolled'), ('from enrolled to enrolled', 'from enrolled to enrolled'), ('from enrolled to unenrolled', 'from enrolled to unenrolled'), ('from unenrolled to enrolled', 'from unenrolled to enrolled'), ('from allowed to enroll to enrolled', 'from allowed to enroll to enrolled'), ('from unenrolled to unenrolled', 'from unenrolled to unenrolled'), ('N/A', 'N/A')])), ('reason', models.TextField(null=True)), ('enrolled_by', models.ForeignKey(to=settings.AUTH_USER_MODEL, null=True, on_delete=models.CASCADE)), ('enrollment', models.ForeignKey(to='student.CourseEnrollment', null=True, on_delete=models.CASCADE)), @@ -186,7 +183,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('new_email', models.CharField(db_index=True, max_length=255, blank=True)), - ('activation_key', models.CharField(unique=True, max_length=32, verbose_name=u'activation key', db_index=True)), + ('activation_key', models.CharField(unique=True, max_length=32, verbose_name='activation key', db_index=True)), ('user', models.OneToOneField(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)), ], ), @@ -203,7 +200,7 @@ class Migration(migrations.Migration): name='Registration', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('activation_key', models.CharField(unique=True, max_length=32, verbose_name=u'activation key', db_index=True)), + ('activation_key', models.CharField(unique=True, max_length=32, verbose_name='activation key', db_index=True)), ('user', models.OneToOneField(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)), ], options={ @@ -216,12 +213,12 @@ class Migration(migrations.Migration): ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), ('name', models.CharField(db_index=True, max_length=255, blank=True)), ('meta', models.TextField(blank=True)), - ('courseware', models.CharField(default=u'course.xml', max_length=255, blank=True)), + ('courseware', models.CharField(default='course.xml', max_length=255, blank=True)), ('language', models.CharField(db_index=True, max_length=255, blank=True)), ('location', models.CharField(db_index=True, max_length=255, blank=True)), ('year_of_birth', models.IntegerField(db_index=True, null=True, blank=True)), - ('gender', models.CharField(blank=True, max_length=6, null=True, db_index=True, choices=[(u'm', u'Male'), (u'f', u'Female'), (u'o', u'Other/Prefer Not to Say')])), - ('level_of_education', models.CharField(blank=True, max_length=6, null=True, db_index=True, choices=[(u'p', u'Doctorate'), (u'm', u"Master's or professional degree"), (u'b', u"Bachelor's degree"), (u'a', u'Associate degree'), (u'hs', u'Secondary/high school'), (u'jhs', u'Junior secondary/junior high/middle school'), (u'el', u'Elementary/primary school'), (u'none', u'No Formal Education'), (u'other', u'Other Education')])), + ('gender', models.CharField(blank=True, max_length=6, null=True, db_index=True, choices=[('m', 'Male'), ('f', 'Female'), ('o', 'Other/Prefer Not to Say')])), + ('level_of_education', models.CharField(blank=True, max_length=6, null=True, db_index=True, choices=[('p', 'Doctorate'), ('m', "Master's or professional degree"), ('b', "Bachelor's degree"), ('a', 'Associate degree'), ('hs', 'Secondary/high school'), ('jhs', 'Junior secondary/junior high/middle school'), ('el', 'Elementary/primary school'), ('none', 'No Formal Education'), ('other', 'Other Education')])), ('mailing_address', models.TextField(null=True, blank=True)), ('city', models.TextField(null=True, blank=True)), ('country', django_countries.fields.CountryField(blank=True, max_length=2, null=True)), @@ -247,7 +244,7 @@ class Migration(migrations.Migration): name='UserStanding', fields=[ ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)), - ('account_status', models.CharField(blank=True, max_length=31, choices=[(u'disabled', u'Account Disabled'), (u'enabled', u'Account Enabled')])), + ('account_status', models.CharField(blank=True, max_length=31, choices=[('disabled', 'Account Disabled'), ('enabled', 'Account Enabled')])), ('standing_last_changed_at', models.DateTimeField(auto_now=True)), ('changed_by', models.ForeignKey(to=settings.AUTH_USER_MODEL, blank=True, on_delete=models.CASCADE)), ('user', models.OneToOneField(related_name='standing', to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)), @@ -269,22 +266,22 @@ class Migration(migrations.Migration): ), migrations.AlterUniqueTogether( name='courseenrollmentallowed', - unique_together=set([('email', 'course_id')]), + unique_together={('email', 'course_id')}, ), migrations.AlterUniqueTogether( name='languageproficiency', - unique_together=set([('code', 'user_profile')]), + unique_together={('code', 'user_profile')}, ), migrations.AlterUniqueTogether( name='entranceexamconfiguration', - unique_together=set([('user', 'course_id')]), + unique_together={('user', 'course_id')}, ), migrations.AlterUniqueTogether( name='courseenrollment', - unique_together=set([('user', 'course_id')]), + unique_together={('user', 'course_id')}, ), migrations.AlterUniqueTogether( name='courseaccessrole', - unique_together=set([('user', 'org', 'course_id', 'role')]), + unique_together={('user', 'org', 'course_id', 'role')}, ), ] 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 c54433a088..400c74e137 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,4 +1,3 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2020-04-13 17:34 @@ -11,14 +10,13 @@ import opaque_keys.edx.django.models import simple_history.models from django.conf import settings from django.db import migrations, models -from lms.djangoapps.experiments.models import ExperimentData -from common.djangoapps.student.models import CourseEnrollment, FBEEnrollmentExclusion import openedx.core.djangolib.model_mixins from common.djangoapps.course_modes import models as course_modes_models +from common.djangoapps.student.models import CourseEnrollment, FBEEnrollmentExclusion +from lms.djangoapps.experiments.models import ExperimentData from openedx.features.course_duration_limits.config import EXPERIMENT_DATA_HOLDBACK_KEY, EXPERIMENT_ID - # These data migrations do not require changes when building from scratch. # student.migrations.0029_add_data_researcher # student.migrations.0011_course_key_field_to_foreign_key @@ -287,15 +285,15 @@ class Migration(migrations.Migration): ), migrations.AlterUniqueTogether( name='courseenrollmentallowed', - unique_together=set([('email', 'course_id')]), + unique_together={('email', 'course_id')}, ), migrations.AlterUniqueTogether( name='languageproficiency', - unique_together=set([('code', 'user_profile')]), + unique_together={('code', 'user_profile')}, ), migrations.AlterUniqueTogether( name='entranceexamconfiguration', - unique_together=set([('user', 'course_id')]), + unique_together={('user', 'course_id')}, ), migrations.AlterField( model_name='courseenrollment', @@ -304,11 +302,11 @@ class Migration(migrations.Migration): ), migrations.AlterUniqueTogether( name='courseenrollment', - unique_together=set([('user', 'course_id')]), + unique_together={('user', 'course_id')}, ), migrations.AlterUniqueTogether( name='courseaccessrole', - unique_together=set([('user', 'org', 'course_id', 'role')]), + unique_together={('user', 'org', 'course_id', 'role')}, ), migrations.CreateModel( name='UserAttribute', @@ -323,7 +321,7 @@ class Migration(migrations.Migration): ), migrations.AlterUniqueTogether( name='userattribute', - unique_together=set([('user', 'name')]), + unique_together={('user', 'name')}, ), migrations.AlterField( model_name='userattribute', @@ -364,7 +362,7 @@ class Migration(migrations.Migration): ), migrations.AlterUniqueTogether( name='courseenrollment', - unique_together=set([('user', 'course')]), + unique_together={('user', 'course')}, ), migrations.CreateModel( name='SocialLink', diff --git a/common/djangoapps/student/migrations/0002_auto_20151208_1034.py b/common/djangoapps/student/migrations/0002_auto_20151208_1034.py index 7c0a9519f4..8ea695fb1e 100644 --- a/common/djangoapps/student/migrations/0002_auto_20151208_1034.py +++ b/common/djangoapps/student/migrations/0002_auto_20151208_1034.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- - - from django.db import migrations, models @@ -14,11 +11,11 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='courseenrollment', name='mode', - field=models.CharField(default=u'audit', max_length=100), + field=models.CharField(default='audit', max_length=100), ), migrations.AlterField( model_name='historicalcourseenrollment', name='mode', - field=models.CharField(default=u'audit', max_length=100), + field=models.CharField(default='audit', max_length=100), ), ] diff --git a/common/djangoapps/student/migrations/0003_auto_20160516_0938.py b/common/djangoapps/student/migrations/0003_auto_20160516_0938.py index 73b77a7261..cc97f760e9 100644 --- a/common/djangoapps/student/migrations/0003_auto_20160516_0938.py +++ b/common/djangoapps/student/migrations/0003_auto_20160516_0938.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- - - import django.utils.timezone import model_utils.fields from django.conf import settings @@ -28,6 +25,6 @@ class Migration(migrations.Migration): ), migrations.AlterUniqueTogether( name='userattribute', - unique_together=set([('user', 'name')]), + unique_together={('user', 'name')}, ), ] diff --git a/common/djangoapps/student/migrations/0004_auto_20160531_1422.py b/common/djangoapps/student/migrations/0004_auto_20160531_1422.py index fc43adc288..0e253f80f2 100644 --- a/common/djangoapps/student/migrations/0004_auto_20160531_1422.py +++ b/common/djangoapps/student/migrations/0004_auto_20160531_1422.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- - - from django.db import migrations, models diff --git a/common/djangoapps/student/migrations/0005_auto_20160531_1653.py b/common/djangoapps/student/migrations/0005_auto_20160531_1653.py index afeea332db..08ac8b7b75 100644 --- a/common/djangoapps/student/migrations/0005_auto_20160531_1653.py +++ b/common/djangoapps/student/migrations/0005_auto_20160531_1653.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- - - from django.db import migrations, models diff --git a/common/djangoapps/student/migrations/0006_logoutviewconfiguration.py b/common/djangoapps/student/migrations/0006_logoutviewconfiguration.py index e124c59d38..1752c6c393 100644 --- a/common/djangoapps/student/migrations/0006_logoutviewconfiguration.py +++ b/common/djangoapps/student/migrations/0006_logoutviewconfiguration.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- - - import django.db.models.deletion from django.conf import settings from django.db import migrations, models diff --git a/common/djangoapps/student/migrations/0007_registrationcookieconfiguration.py b/common/djangoapps/student/migrations/0007_registrationcookieconfiguration.py index 7b491063c2..37fbb0b811 100644 --- a/common/djangoapps/student/migrations/0007_registrationcookieconfiguration.py +++ b/common/djangoapps/student/migrations/0007_registrationcookieconfiguration.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- - - import django.db.models.deletion from django.conf import settings from django.db import migrations, models diff --git a/common/djangoapps/student/migrations/0008_auto_20161117_1209.py b/common/djangoapps/student/migrations/0008_auto_20161117_1209.py index 37d0cac36c..591dc99229 100644 --- a/common/djangoapps/student/migrations/0008_auto_20161117_1209.py +++ b/common/djangoapps/student/migrations/0008_auto_20161117_1209.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- - - from django.db import migrations, models @@ -14,6 +11,6 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='userprofile', name='level_of_education', - field=models.CharField(blank=True, max_length=6, null=True, db_index=True, choices=[(u'p', u'Doctorate'), (u'm', u"Master's or professional degree"), (u'b', u"Bachelor's degree"), (u'a', u'Associate degree'), (u'hs', u'Secondary/high school'), (u'jhs', u'Junior secondary/junior high/middle school'), (u'el', u'Elementary/primary school'), (u'none', u'No formal education'), (u'other', u'Other education')]), + field=models.CharField(blank=True, max_length=6, null=True, db_index=True, choices=[('p', 'Doctorate'), ('m', "Master's or professional degree"), ('b', "Bachelor's degree"), ('a', 'Associate degree'), ('hs', 'Secondary/high school'), ('jhs', 'Junior secondary/junior high/middle school'), ('el', 'Elementary/primary school'), ('none', 'No formal education'), ('other', 'Other education')]), ), ] diff --git a/common/djangoapps/student/migrations/0009_auto_20170111_0422.py b/common/djangoapps/student/migrations/0009_auto_20170111_0422.py index a093a4a108..412480e94f 100644 --- a/common/djangoapps/student/migrations/0009_auto_20170111_0422.py +++ b/common/djangoapps/student/migrations/0009_auto_20170111_0422.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- - - from django.db import migrations, models diff --git a/common/djangoapps/student/migrations/0010_auto_20170207_0458.py b/common/djangoapps/student/migrations/0010_auto_20170207_0458.py index 7e67311af7..93f0038f13 100644 --- a/common/djangoapps/student/migrations/0010_auto_20170207_0458.py +++ b/common/djangoapps/student/migrations/0010_auto_20170207_0458.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- - - from django.db import migrations, models diff --git a/common/djangoapps/student/migrations/0011_course_key_field_to_foreign_key.py b/common/djangoapps/student/migrations/0011_course_key_field_to_foreign_key.py index 7c29455628..00cd4eadf0 100644 --- a/common/djangoapps/student/migrations/0011_course_key_field_to_foreign_key.py +++ b/common/djangoapps/student/migrations/0011_course_key_field_to_foreign_key.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- - - import django.db.models.deletion from django.db import migrations, models from opaque_keys.edx.django.models import CourseKeyField @@ -71,6 +68,6 @@ class Migration(migrations.Migration): ), migrations.AlterUniqueTogether( name='courseenrollment', - unique_together=set([('user', 'course')]), + unique_together={('user', 'course')}, ), ] diff --git a/common/djangoapps/student/migrations/0012_sociallink.py b/common/djangoapps/student/migrations/0012_sociallink.py index 73e929d130..4337d11e94 100644 --- a/common/djangoapps/student/migrations/0012_sociallink.py +++ b/common/djangoapps/student/migrations/0012_sociallink.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- - - from django.db import migrations, models diff --git a/common/djangoapps/student/migrations/0013_delete_historical_enrollment_records.py b/common/djangoapps/student/migrations/0013_delete_historical_enrollment_records.py index 9ad7793789..d4e924b721 100644 --- a/common/djangoapps/student/migrations/0013_delete_historical_enrollment_records.py +++ b/common/djangoapps/student/migrations/0013_delete_historical_enrollment_records.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- - - from django.db import migrations, models diff --git a/common/djangoapps/student/migrations/0014_courseenrollmentallowed_user.py b/common/djangoapps/student/migrations/0014_courseenrollmentallowed_user.py index 261d810127..1f8b315ef4 100644 --- a/common/djangoapps/student/migrations/0014_courseenrollmentallowed_user.py +++ b/common/djangoapps/student/migrations/0014_courseenrollmentallowed_user.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- - - from django.conf import settings from django.db import migrations, models diff --git a/common/djangoapps/student/migrations/0015_manualenrollmentaudit_add_role.py b/common/djangoapps/student/migrations/0015_manualenrollmentaudit_add_role.py index 7d2c2c1dfc..a0d523c448 100644 --- a/common/djangoapps/student/migrations/0015_manualenrollmentaudit_add_role.py +++ b/common/djangoapps/student/migrations/0015_manualenrollmentaudit_add_role.py @@ -1,6 +1,3 @@ -# -*- coding: utf-8 -*- - - from django.db import migrations, models diff --git a/common/djangoapps/student/migrations/0016_coursenrollment_course_on_delete_do_nothing.py b/common/djangoapps/student/migrations/0016_coursenrollment_course_on_delete_do_nothing.py index b4dc388729..1d1c39b667 100644 --- a/common/djangoapps/student/migrations/0016_coursenrollment_course_on_delete_do_nothing.py +++ b/common/djangoapps/student/migrations/0016_coursenrollment_course_on_delete_do_nothing.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.11.14 on 2018-07-27 01:44 diff --git a/common/djangoapps/student/migrations/0017_accountrecovery.py b/common/djangoapps/student/migrations/0017_accountrecovery.py index 8b505462cd..8347d04357 100644 --- a/common/djangoapps/student/migrations/0017_accountrecovery.py +++ b/common/djangoapps/student/migrations/0017_accountrecovery.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.11.16 on 2018-12-10 12:15 diff --git a/common/djangoapps/student/migrations/0018_remove_password_history.py b/common/djangoapps/student/migrations/0018_remove_password_history.py index 9a232f6124..45e8af5a08 100644 --- a/common/djangoapps/student/migrations/0018_remove_password_history.py +++ b/common/djangoapps/student/migrations/0018_remove_password_history.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.11.16 on 2018-12-19 14:30 diff --git a/common/djangoapps/student/migrations/0019_auto_20181221_0540.py b/common/djangoapps/student/migrations/0019_auto_20181221_0540.py index efe99de60d..4ee9c71e8a 100644 --- a/common/djangoapps/student/migrations/0019_auto_20181221_0540.py +++ b/common/djangoapps/student/migrations/0019_auto_20181221_0540.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.11.16 on 2018-12-21 10:40 @@ -22,7 +21,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('new_secondary_email', models.CharField(blank=True, db_index=True, max_length=255)), - ('activation_key', models.CharField(db_index=True, max_length=32, unique=True, verbose_name=u'activation key')), + ('activation_key', models.CharField(db_index=True, max_length=32, unique=True, verbose_name='activation key')), ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], bases=(openedx.core.djangolib.model_mixins.DeletableByUserValue, models.Model), diff --git a/common/djangoapps/student/migrations/0020_auto_20190227_2019.py b/common/djangoapps/student/migrations/0020_auto_20190227_2019.py index c670436c63..94fcb996ee 100644 --- a/common/djangoapps/student/migrations/0020_auto_20190227_2019.py +++ b/common/djangoapps/student/migrations/0020_auto_20190227_2019.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-02-27 20:19 diff --git a/common/djangoapps/student/migrations/0021_historicalcourseenrollment.py b/common/djangoapps/student/migrations/0021_historicalcourseenrollment.py index 6871558dc1..2c63f9cea3 100644 --- a/common/djangoapps/student/migrations/0021_historicalcourseenrollment.py +++ b/common/djangoapps/student/migrations/0021_historicalcourseenrollment.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-04-25 20:18 @@ -25,7 +24,7 @@ class Migration(migrations.Migration): ('id', models.IntegerField(auto_created=True, blank=True, db_index=True, verbose_name='ID')), ('created', models.DateTimeField(blank=True, db_index=True, editable=False, null=True)), ('is_active', models.BooleanField(default=True)), - ('mode', models.CharField(default=u'audit', max_length=100)), + ('mode', models.CharField(default='audit', max_length=100)), ('history_id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)), ('history_date', models.DateTimeField()), ('history_change_reason', models.CharField(max_length=100, null=True)), diff --git a/common/djangoapps/student/migrations/0022_indexing_in_courseenrollment.py b/common/djangoapps/student/migrations/0022_indexing_in_courseenrollment.py index 5a17f586fd..634725e153 100644 --- a/common/djangoapps/student/migrations/0022_indexing_in_courseenrollment.py +++ b/common/djangoapps/student/migrations/0022_indexing_in_courseenrollment.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-06-24 19:01 diff --git a/common/djangoapps/student/migrations/0023_bulkunenrollconfiguration.py b/common/djangoapps/student/migrations/0023_bulkunenrollconfiguration.py index 476fa1b7aa..9ff534d159 100644 --- a/common/djangoapps/student/migrations/0023_bulkunenrollconfiguration.py +++ b/common/djangoapps/student/migrations/0023_bulkunenrollconfiguration.py @@ -1,11 +1,10 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.11.24 on 2019-09-19 19:51 -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): @@ -22,7 +21,7 @@ class Migration(migrations.Migration): ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('change_date', models.DateTimeField(auto_now_add=True, verbose_name='Change date')), ('enabled', models.BooleanField(default=False, verbose_name='Enabled')), - ('csv_file', models.FileField(help_text='It expect that the data will be provided in a csv file format with first row being the header and columns will be as follows: user_id, username, email, course_id, is_verified, verification_date', upload_to=u'', validators=[django.core.validators.FileExtensionValidator(allowed_extensions=[u'csv'])])), + ('csv_file', models.FileField(help_text='It expect that the data will be provided in a csv file format with first row being the header and columns will be as follows: user_id, username, email, course_id, is_verified, verification_date', upload_to='', validators=[django.core.validators.FileExtensionValidator(allowed_extensions=['csv'])])), ('changed_by', models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.PROTECT, to=settings.AUTH_USER_MODEL, verbose_name='Changed by')), ], options={ diff --git a/common/djangoapps/student/migrations/0024_fbeenrollmentexclusion.py b/common/djangoapps/student/migrations/0024_fbeenrollmentexclusion.py index 8448dad173..72316d8e4a 100644 --- a/common/djangoapps/student/migrations/0024_fbeenrollmentexclusion.py +++ b/common/djangoapps/student/migrations/0024_fbeenrollmentexclusion.py @@ -1,9 +1,8 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.11.25 on 2019-11-01 15:56 -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/student/migrations/0025_auto_20191101_1846.py b/common/djangoapps/student/migrations/0025_auto_20191101_1846.py index 1bdfaee558..d3dfb8dd21 100644 --- a/common/djangoapps/student/migrations/0025_auto_20191101_1846.py +++ b/common/djangoapps/student/migrations/0025_auto_20191101_1846.py @@ -1,12 +1,11 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.11.25 on 2019-11-01 18:46 from django.db import migrations +from common.djangoapps.student.models import CourseEnrollment, FBEEnrollmentExclusion from lms.djangoapps.experiments.models import ExperimentData from openedx.features.course_duration_limits.config import EXPERIMENT_DATA_HOLDBACK_KEY, EXPERIMENT_ID -from common.djangoapps.student.models import CourseEnrollment, FBEEnrollmentExclusion def populate_fbeenrollmentexclusion(apps, schema_editor): diff --git a/common/djangoapps/student/migrations/0026_allowedauthuser.py b/common/djangoapps/student/migrations/0026_allowedauthuser.py index 4c88e0e424..7d08c1ab23 100644 --- a/common/djangoapps/student/migrations/0026_allowedauthuser.py +++ b/common/djangoapps/student/migrations/0026_allowedauthuser.py @@ -1,11 +1,10 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.11.26 on 2019-11-14 14:12 -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/common/djangoapps/student/migrations/0027_courseenrollment_mode_callable_default.py b/common/djangoapps/student/migrations/0027_courseenrollment_mode_callable_default.py index aceb9b6acc..b83e4277d0 100644 --- a/common/djangoapps/student/migrations/0027_courseenrollment_mode_callable_default.py +++ b/common/djangoapps/student/migrations/0027_courseenrollment_mode_callable_default.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.11.22 on 2019-07-19 13:06 diff --git a/common/djangoapps/student/migrations/0028_historicalmanualenrollmentaudit.py b/common/djangoapps/student/migrations/0028_historicalmanualenrollmentaudit.py index abf8df2d53..9efaed2703 100644 --- a/common/djangoapps/student/migrations/0028_historicalmanualenrollmentaudit.py +++ b/common/djangoapps/student/migrations/0028_historicalmanualenrollmentaudit.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.11.27 on 2019-12-27 20:44 diff --git a/common/djangoapps/student/migrations/0029_add_data_researcher.py b/common/djangoapps/student/migrations/0029_add_data_researcher.py index 90f9ff98ac..2f5f7fc87a 100644 --- a/common/djangoapps/student/migrations/0029_add_data_researcher.py +++ b/common/djangoapps/student/migrations/0029_add_data_researcher.py @@ -1,8 +1,8 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.11.27 on 2020-01-27 19:02 from django.db import migrations + from common.djangoapps.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 81732fc5f8..9b6662dfe2 100644 --- a/common/djangoapps/student/migrations/0030_userprofile_phone_number.py +++ b/common/djangoapps/student/migrations/0030_userprofile_phone_number.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.11.28 on 2020-02-18 18:36 diff --git a/common/djangoapps/student/migrations/0031_auto_20200317_1122.py b/common/djangoapps/student/migrations/0031_auto_20200317_1122.py index 4e9ba1866a..b09eb4aa2a 100644 --- a/common/djangoapps/student/migrations/0031_auto_20200317_1122.py +++ b/common/djangoapps/student/migrations/0031_auto_20200317_1122.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2020-03-17 11:22 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 151968ead5..6c58e370df 100644 --- a/common/djangoapps/student/migrations/0032_removed_logout_view_configuration.py +++ b/common/djangoapps/student/migrations/0032_removed_logout_view_configuration.py @@ -1,4 +1,3 @@ -# -*- coding: utf-8 -*- # Generated by Django 1.11.29 on 2020-03-25 14:28 diff --git a/common/djangoapps/student/migrations/0034_courseenrollmentcelebration.py b/common/djangoapps/student/migrations/0034_courseenrollmentcelebration.py index 7bf6f3c857..1b420df022 100644 --- a/common/djangoapps/student/migrations/0034_courseenrollmentcelebration.py +++ b/common/djangoapps/student/migrations/0034_courseenrollmentcelebration.py @@ -1,9 +1,9 @@ # Generated by Django 2.2.12 on 2020-06-08 15:12 -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/common/djangoapps/student/migrations/0035_bulkchangeenrollmentconfiguration.py b/common/djangoapps/student/migrations/0035_bulkchangeenrollmentconfiguration.py index d7f2fac075..0f61b03b7b 100644 --- a/common/djangoapps/student/migrations/0035_bulkchangeenrollmentconfiguration.py +++ b/common/djangoapps/student/migrations/0035_bulkchangeenrollmentconfiguration.py @@ -1,9 +1,9 @@ # Generated by Django 2.2.14 on 2020-07-16 10:33 -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): diff --git a/common/djangoapps/student/migrations/0036_userpasswordtogglehistory.py b/common/djangoapps/student/migrations/0036_userpasswordtogglehistory.py index 2bcef73f76..2a35dffd58 100644 --- a/common/djangoapps/student/migrations/0036_userpasswordtogglehistory.py +++ b/common/djangoapps/student/migrations/0036_userpasswordtogglehistory.py @@ -1,10 +1,10 @@ # Generated by Django 2.2.16 on 2020-10-15 10:19 -from django.conf import settings -from django.db import migrations, models import django.db.models.deletion import django.utils.timezone import model_utils.fields +from django.conf import settings +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/common/djangoapps/student/migrations/0039_anon_id_context.py b/common/djangoapps/student/migrations/0039_anon_id_context.py index f241d3623c..a646c4e3e4 100644 --- a/common/djangoapps/student/migrations/0039_anon_id_context.py +++ b/common/djangoapps/student/migrations/0039_anon_id_context.py @@ -3,8 +3,8 @@ # # This migration does not produce any changes at the database level. -from django.db import migrations import opaque_keys.edx.django.models +from django.db import migrations class Migration(migrations.Migration): diff --git a/common/djangoapps/student/migrations/0040_usercelebration.py b/common/djangoapps/student/migrations/0040_usercelebration.py index aea99c39c8..3fc75618c2 100644 --- a/common/djangoapps/student/migrations/0040_usercelebration.py +++ b/common/djangoapps/student/migrations/0040_usercelebration.py @@ -1,10 +1,10 @@ # Generated by Django 2.2.18 on 2021-02-18 22:49 -from django.conf import settings -from django.db import migrations, models import django.db.models.deletion import django.utils.timezone import model_utils.fields +from django.conf import settings +from django.db import migrations, models class Migration(migrations.Migration):