From 0cbf4845cf825caba58fbb22cef4706ae7077c01 Mon Sep 17 00:00:00 2001
From: Bill Gardynski <bgardynski@gmail.com>
Date: Mon, 29 Apr 2019 13:00:59 -0400
Subject: [PATCH] INCR-197 (#20156)

---
 common/djangoapps/student/migrations/0001_initial.py         | 2 +-
 .../djangoapps/student/migrations/0002_auto_20151208_1034.py | 2 +-
 .../djangoapps/student/migrations/0003_auto_20160516_0938.py | 2 +-
 .../djangoapps/student/migrations/0004_auto_20160531_1422.py | 2 +-
 .../djangoapps/student/migrations/0005_auto_20160531_1653.py | 2 +-
 .../student/migrations/0006_logoutviewconfiguration.py       | 2 +-
 .../migrations/0007_registrationcookieconfiguration.py       | 2 +-
 .../djangoapps/student/migrations/0008_auto_20161117_1209.py | 2 +-
 .../djangoapps/student/migrations/0009_auto_20170111_0422.py | 2 +-
 .../djangoapps/student/migrations/0010_auto_20170207_0458.py | 2 +-
 .../migrations/0011_course_key_field_to_foreign_key.py       | 4 ++--
 common/djangoapps/student/migrations/0012_sociallink.py      | 2 +-
 .../migrations/0013_delete_historical_enrollment_records.py  | 2 +-
 .../student/migrations/0014_courseenrollmentallowed_user.py  | 4 ++--
 .../migrations/0015_manualenrollmentaudit_add_role.py        | 2 +-
 .../0016_coursenrollment_course_on_delete_do_nothing.py      | 4 ++--
 common/djangoapps/student/migrations/0017_accountrecovery.py | 4 ++--
 .../student/migrations/0018_remove_password_history.py       | 2 +-
 .../djangoapps/student/migrations/0019_auto_20181221_0540.py | 5 +++--
 .../djangoapps/student/migrations/0020_auto_20190227_2019.py | 2 +-
 20 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/common/djangoapps/student/migrations/0001_initial.py b/common/djangoapps/student/migrations/0001_initial.py
index 2d4f1af201..db1e6f0f33 100644
--- a/common/djangoapps/student/migrations/0001_initial.py
+++ b/common/djangoapps/student/migrations/0001_initial.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 import django.db.models.deletion
 import django.utils.timezone
diff --git a/common/djangoapps/student/migrations/0002_auto_20151208_1034.py b/common/djangoapps/student/migrations/0002_auto_20151208_1034.py
index 80d85b8561..1b6b34771f 100644
--- a/common/djangoapps/student/migrations/0002_auto_20151208_1034.py
+++ b/common/djangoapps/student/migrations/0002_auto_20151208_1034.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 from django.db import migrations, models
 
diff --git a/common/djangoapps/student/migrations/0003_auto_20160516_0938.py b/common/djangoapps/student/migrations/0003_auto_20160516_0938.py
index 9d041fc6cb..4f64d33ccc 100644
--- a/common/djangoapps/student/migrations/0003_auto_20160516_0938.py
+++ b/common/djangoapps/student/migrations/0003_auto_20160516_0938.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 import django.utils.timezone
 import model_utils.fields
diff --git a/common/djangoapps/student/migrations/0004_auto_20160531_1422.py b/common/djangoapps/student/migrations/0004_auto_20160531_1422.py
index 7163cb5f22..56213c6768 100644
--- a/common/djangoapps/student/migrations/0004_auto_20160531_1422.py
+++ b/common/djangoapps/student/migrations/0004_auto_20160531_1422.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 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 0ad3e17360..af58ad3489 100644
--- a/common/djangoapps/student/migrations/0005_auto_20160531_1653.py
+++ b/common/djangoapps/student/migrations/0005_auto_20160531_1653.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 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 009fb87d7a..5d82c572d9 100644
--- a/common/djangoapps/student/migrations/0006_logoutviewconfiguration.py
+++ b/common/djangoapps/student/migrations/0006_logoutviewconfiguration.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 import django.db.models.deletion
 from django.conf import settings
diff --git a/common/djangoapps/student/migrations/0007_registrationcookieconfiguration.py b/common/djangoapps/student/migrations/0007_registrationcookieconfiguration.py
index 7dd87d7ce7..ba99133e9c 100644
--- a/common/djangoapps/student/migrations/0007_registrationcookieconfiguration.py
+++ b/common/djangoapps/student/migrations/0007_registrationcookieconfiguration.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 import django.db.models.deletion
 from django.conf import settings
diff --git a/common/djangoapps/student/migrations/0008_auto_20161117_1209.py b/common/djangoapps/student/migrations/0008_auto_20161117_1209.py
index 6dee71b711..8e062e89c9 100644
--- a/common/djangoapps/student/migrations/0008_auto_20161117_1209.py
+++ b/common/djangoapps/student/migrations/0008_auto_20161117_1209.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 from django.db import migrations, models
 
diff --git a/common/djangoapps/student/migrations/0009_auto_20170111_0422.py b/common/djangoapps/student/migrations/0009_auto_20170111_0422.py
index 44642ce91e..c709214f96 100644
--- a/common/djangoapps/student/migrations/0009_auto_20170111_0422.py
+++ b/common/djangoapps/student/migrations/0009_auto_20170111_0422.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 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 901e70ebf3..e2d896b687 100644
--- a/common/djangoapps/student/migrations/0010_auto_20170207_0458.py
+++ b/common/djangoapps/student/migrations/0010_auto_20170207_0458.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 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 0724f0d7ae..de32f95a73 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,8 +1,8 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
-from django.db import migrations, models
 import django.db.models.deletion
+from django.db import migrations, models
 from opaque_keys.edx.django.models import CourseKeyField
 
 
diff --git a/common/djangoapps/student/migrations/0012_sociallink.py b/common/djangoapps/student/migrations/0012_sociallink.py
index b81df8ddc9..6bfd1dbd96 100644
--- a/common/djangoapps/student/migrations/0012_sociallink.py
+++ b/common/djangoapps/student/migrations/0012_sociallink.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 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 020c724e86..911400ce9d 100644
--- a/common/djangoapps/student/migrations/0013_delete_historical_enrollment_records.py
+++ b/common/djangoapps/student/migrations/0013_delete_historical_enrollment_records.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 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 8db32abbbd..e6b7ecc11a 100644
--- a/common/djangoapps/student/migrations/0014_courseenrollmentallowed_user.py
+++ b/common/djangoapps/student/migrations/0014_courseenrollmentallowed_user.py
@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
-from django.db import migrations, models
 from django.conf import settings
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
diff --git a/common/djangoapps/student/migrations/0015_manualenrollmentaudit_add_role.py b/common/djangoapps/student/migrations/0015_manualenrollmentaudit_add_role.py
index 9178dd66df..2eb319c70a 100644
--- a/common/djangoapps/student/migrations/0015_manualenrollmentaudit_add_role.py
+++ b/common/djangoapps/student/migrations/0015_manualenrollmentaudit_add_role.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 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 cb1cef83c5..de7def41ba 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,9 +1,9 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.14 on 2018-07-27 01:44
-from __future__ import unicode_literals
+from __future__ import absolute_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/student/migrations/0017_accountrecovery.py b/common/djangoapps/student/migrations/0017_accountrecovery.py
index e138dd47bd..eed5cf9f83 100644
--- a/common/djangoapps/student/migrations/0017_accountrecovery.py
+++ b/common/djangoapps/student/migrations/0017_accountrecovery.py
@@ -1,10 +1,10 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.16 on 2018-12-10 12:15
-from __future__ import unicode_literals
+from __future__ import absolute_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):
diff --git a/common/djangoapps/student/migrations/0018_remove_password_history.py b/common/djangoapps/student/migrations/0018_remove_password_history.py
index 01ed6c6677..faac12cf84 100644
--- a/common/djangoapps/student/migrations/0018_remove_password_history.py
+++ b/common/djangoapps/student/migrations/0018_remove_password_history.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.16 on 2018-12-19 14:30
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 from django.db import migrations
 
diff --git a/common/djangoapps/student/migrations/0019_auto_20181221_0540.py b/common/djangoapps/student/migrations/0019_auto_20181221_0540.py
index 2b351a384d..1847c41645 100644
--- a/common/djangoapps/student/migrations/0019_auto_20181221_0540.py
+++ b/common/djangoapps/student/migrations/0019_auto_20181221_0540.py
@@ -1,10 +1,11 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.16 on 2018-12-21 10:40
-from __future__ import unicode_literals
+from __future__ import absolute_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.djangolib.model_mixins
 
 
diff --git a/common/djangoapps/student/migrations/0020_auto_20190227_2019.py b/common/djangoapps/student/migrations/0020_auto_20190227_2019.py
index 7d83469426..7be3ae7fbc 100644
--- a/common/djangoapps/student/migrations/0020_auto_20190227_2019.py
+++ b/common/djangoapps/student/migrations/0020_auto_20190227_2019.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # Generated by Django 1.11.20 on 2019-02-27 20:19
-from __future__ import unicode_literals
+from __future__ import absolute_import, unicode_literals
 
 from django.db import migrations