From 4e1f63bd15eda4df54321b94fc513666e7a64c7e Mon Sep 17 00:00:00 2001 From: Stu Young Date: Tue, 21 May 2019 11:27:52 -0400 Subject: [PATCH] INCR-283 Run python-modernize on lms/djangoapps/program_enrollments/migrations and lms/djangoapps/program_enrollments/tests (#20578) * run python modernize * run isort * Fix merge conflicts * Fix merge conflict--file was deleted on master --- .../api/v1/tests/factories.py | 2 ++ .../migrations/0001_initial.py | 6 +++--- ...courseenrollment_programcourseenrollment.py | 6 +++--- .../migrations/0003_auto_20190424_1622.py | 2 +- ..._add_programcourseenrollment_relatedname.py | 4 ++-- .../program_enrollments/tests/test_admin.py | 8 ++++---- .../program_enrollments/tests/test_models.py | 13 +++++++------ .../program_enrollments/tests/test_utils.py | 18 +++++++++++------- 8 files changed, 33 insertions(+), 26 deletions(-) diff --git a/lms/djangoapps/program_enrollments/api/v1/tests/factories.py b/lms/djangoapps/program_enrollments/api/v1/tests/factories.py index 67540c347c..120ba875a2 100644 --- a/lms/djangoapps/program_enrollments/api/v1/tests/factories.py +++ b/lms/djangoapps/program_enrollments/api/v1/tests/factories.py @@ -1,6 +1,8 @@ """ Factories for Program Enrollment tests. """ +from __future__ import absolute_import + from uuid import uuid4 import factory diff --git a/lms/djangoapps/program_enrollments/migrations/0001_initial.py b/lms/djangoapps/program_enrollments/migrations/0001_initial.py index 7a75c1801f..014a7eb4d9 100644 --- a/lms/djangoapps/program_enrollments/migrations/0001_initial.py +++ b/lms/djangoapps/program_enrollments/migrations/0001_initial.py @@ -1,13 +1,13 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-04-09 19:32 -from __future__ import unicode_literals +from __future__ import absolute_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): diff --git a/lms/djangoapps/program_enrollments/migrations/0002_historicalprogramcourseenrollment_programcourseenrollment.py b/lms/djangoapps/program_enrollments/migrations/0002_historicalprogramcourseenrollment_programcourseenrollment.py index 2a1bdc436e..32ae8cc5b0 100644 --- a/lms/djangoapps/program_enrollments/migrations/0002_historicalprogramcourseenrollment_programcourseenrollment.py +++ b/lms/djangoapps/program_enrollments/migrations/0002_historicalprogramcourseenrollment_programcourseenrollment.py @@ -1,14 +1,14 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-04-19 16:48 -from __future__ import unicode_literals +from __future__ import absolute_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 opaque_keys.edx.django.models import simple_history.models +from django.conf import settings +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/lms/djangoapps/program_enrollments/migrations/0003_auto_20190424_1622.py b/lms/djangoapps/program_enrollments/migrations/0003_auto_20190424_1622.py index 24eea99cb5..fec3bafd92 100644 --- a/lms/djangoapps/program_enrollments/migrations/0003_auto_20190424_1622.py +++ b/lms/djangoapps/program_enrollments/migrations/0003_auto_20190424_1622.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-04-24 16:22 -from __future__ import unicode_literals +from __future__ import absolute_import, unicode_literals from django.conf import settings from django.db import migrations diff --git a/lms/djangoapps/program_enrollments/migrations/0004_add_programcourseenrollment_relatedname.py b/lms/djangoapps/program_enrollments/migrations/0004_add_programcourseenrollment_relatedname.py index 67fc74aa1f..cad69109b3 100644 --- a/lms/djangoapps/program_enrollments/migrations/0004_add_programcourseenrollment_relatedname.py +++ b/lms/djangoapps/program_enrollments/migrations/0004_add_programcourseenrollment_relatedname.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.20 on 2019-05-01 21:46 -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/lms/djangoapps/program_enrollments/tests/test_admin.py b/lms/djangoapps/program_enrollments/tests/test_admin.py index 558dcb1939..e565476007 100644 --- a/lms/djangoapps/program_enrollments/tests/test_admin.py +++ b/lms/djangoapps/program_enrollments/tests/test_admin.py @@ -1,14 +1,14 @@ """ Unit tests for the ProgramEnrollment admin classes. """ -from __future__ import unicode_literals +from __future__ import absolute_import, unicode_literals +import mock from django.contrib.admin.sites import AdminSite from django.test import TestCase -import mock -from lms.djangoapps.program_enrollments.admin import ProgramEnrollmentAdmin, ProgramCourseEnrollmentAdmin -from lms.djangoapps.program_enrollments.models import ProgramEnrollment, ProgramCourseEnrollment +from lms.djangoapps.program_enrollments.admin import ProgramCourseEnrollmentAdmin, ProgramEnrollmentAdmin +from lms.djangoapps.program_enrollments.models import ProgramCourseEnrollment, ProgramEnrollment class ProgramEnrollmentAdminTests(TestCase): diff --git a/lms/djangoapps/program_enrollments/tests/test_models.py b/lms/djangoapps/program_enrollments/tests/test_models.py index 19572d6c46..ae701933fc 100644 --- a/lms/djangoapps/program_enrollments/tests/test_models.py +++ b/lms/djangoapps/program_enrollments/tests/test_models.py @@ -1,17 +1,18 @@ """ Unit tests for ProgramEnrollment models. """ -from __future__ import unicode_literals +from __future__ import absolute_import, unicode_literals from uuid import uuid4 -from testfixtures import LogCapture from django.test import TestCase from opaque_keys.edx.keys import CourseKey +from six.moves import range +from testfixtures import LogCapture -from lms.djangoapps.program_enrollments.models import ProgramEnrollment, ProgramCourseEnrollment -from student.tests.factories import UserFactory, CourseEnrollmentFactory +from lms.djangoapps.program_enrollments.models import ProgramCourseEnrollment, ProgramEnrollment from openedx.core.djangoapps.catalog.tests.factories import generate_course_run_key +from student.tests.factories import CourseEnrollmentFactory, UserFactory class ProgramEnrollmentModelTests(TestCase): @@ -40,7 +41,7 @@ class ProgramEnrollmentModelTests(TestCase): enrollments = [] student_data = {} - for i in xrange(5): + for i in range(5): # This will give us 4 program enrollments for self.program_uuid # and 1 enrollment for self.other_program_uuid user_curriculum = curriculum_b if i % 2 else curriculum_a @@ -77,7 +78,7 @@ class ProgramEnrollmentModelTests(TestCase): def test_user_retirement(self): """ - Test that the external_user_key is uccessfully retired for a user's program enrollments and history. + Test that the external_user_key is successfully retired for a user's program enrollments and history. """ new_status = 'withdrawn' diff --git a/lms/djangoapps/program_enrollments/tests/test_utils.py b/lms/djangoapps/program_enrollments/tests/test_utils.py index 706e2d14a5..7fa9cba4d5 100644 --- a/lms/djangoapps/program_enrollments/tests/test_utils.py +++ b/lms/djangoapps/program_enrollments/tests/test_utils.py @@ -1,21 +1,25 @@ """ Unit tests for program_enrollments utils. """ +from __future__ import absolute_import + from uuid import uuid4 + import pytest from django.core.cache import cache +from organizations.tests.factories import OrganizationFactory +from social_django.models import UserSocialAuth from openedx.core.djangoapps.catalog.cache import PROGRAM_CACHE_KEY_TPL -from openedx.core.djangoapps.catalog.tests.factories import ( - OrganizationFactory as CatalogOrganizationFactory, ProgramFactory -) +from openedx.core.djangoapps.catalog.tests.factories import OrganizationFactory as CatalogOrganizationFactory +from openedx.core.djangoapps.catalog.tests.factories import ProgramFactory from openedx.core.djangolib.testing.utils import CacheIsolationTestCase -from organizations.tests.factories import OrganizationFactory from program_enrollments.utils import ( - get_user_by_program_id, ProgramDoesNotExistException, OrganizationDoesNotExistException, - ProviderDoesNotExistException + OrganizationDoesNotExistException, + ProgramDoesNotExistException, + ProviderDoesNotExistException, + get_user_by_program_id ) -from social_django.models import UserSocialAuth from student.tests.factories import UserFactory from third_party_auth.tests.factories import SAMLProviderConfigFactory