From 7d8f779fc0c5ce53c07200573b595d9624154189 Mon Sep 17 00:00:00 2001 From: Stu Young Date: Wed, 15 May 2019 15:47:59 -0400 Subject: [PATCH] incr-272 (#20567) * run python modernize * run isort --- lms/djangoapps/email_marketing/migrations/0001_initial.py | 4 ++-- .../email_marketing/migrations/0002_auto_20160623_1656.py | 2 +- .../email_marketing/migrations/0003_auto_20160715_1145.py | 2 +- ...mailmarketingconfiguration_welcome_email_send_delay.py | 2 +- ...onfiguration_user_registration_cookie_timeout_delay.py | 2 +- .../email_marketing/migrations/0006_auto_20170711_0615.py | 2 +- .../email_marketing/migrations/0007_auto_20170809_0653.py | 2 +- .../email_marketing/migrations/0008_auto_20170809_0539.py | 2 +- ...marketingconfiguration_sailthru_activation_template.py | 2 +- .../email_marketing/migrations/0010_auto_20180425_0800.py | 2 +- lms/djangoapps/email_marketing/tests/test_signals.py | 8 +++++--- 11 files changed, 16 insertions(+), 14 deletions(-) diff --git a/lms/djangoapps/email_marketing/migrations/0001_initial.py b/lms/djangoapps/email_marketing/migrations/0001_initial.py index c792e3e17d..7a16f87de3 100644 --- a/lms/djangoapps/email_marketing/migrations/0001_initial.py +++ b/lms/djangoapps/email_marketing/migrations/0001_initial.py @@ -1,9 +1,9 @@ # -*- 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.conf import settings +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/lms/djangoapps/email_marketing/migrations/0002_auto_20160623_1656.py b/lms/djangoapps/email_marketing/migrations/0002_auto_20160623_1656.py index 4761335a6c..b81815ff5f 100644 --- a/lms/djangoapps/email_marketing/migrations/0002_auto_20160623_1656.py +++ b/lms/djangoapps/email_marketing/migrations/0002_auto_20160623_1656.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/lms/djangoapps/email_marketing/migrations/0003_auto_20160715_1145.py b/lms/djangoapps/email_marketing/migrations/0003_auto_20160715_1145.py index 56dcb69267..cbc49f3d5a 100644 --- a/lms/djangoapps/email_marketing/migrations/0003_auto_20160715_1145.py +++ b/lms/djangoapps/email_marketing/migrations/0003_auto_20160715_1145.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/lms/djangoapps/email_marketing/migrations/0004_emailmarketingconfiguration_welcome_email_send_delay.py b/lms/djangoapps/email_marketing/migrations/0004_emailmarketingconfiguration_welcome_email_send_delay.py index b632e26a55..f07a692bf0 100644 --- a/lms/djangoapps/email_marketing/migrations/0004_emailmarketingconfiguration_welcome_email_send_delay.py +++ b/lms/djangoapps/email_marketing/migrations/0004_emailmarketingconfiguration_welcome_email_send_delay.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/lms/djangoapps/email_marketing/migrations/0005_emailmarketingconfiguration_user_registration_cookie_timeout_delay.py b/lms/djangoapps/email_marketing/migrations/0005_emailmarketingconfiguration_user_registration_cookie_timeout_delay.py index a40ba64894..30c365178b 100644 --- a/lms/djangoapps/email_marketing/migrations/0005_emailmarketingconfiguration_user_registration_cookie_timeout_delay.py +++ b/lms/djangoapps/email_marketing/migrations/0005_emailmarketingconfiguration_user_registration_cookie_timeout_delay.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/lms/djangoapps/email_marketing/migrations/0006_auto_20170711_0615.py b/lms/djangoapps/email_marketing/migrations/0006_auto_20170711_0615.py index eb349e17a8..54b0793348 100644 --- a/lms/djangoapps/email_marketing/migrations/0006_auto_20170711_0615.py +++ b/lms/djangoapps/email_marketing/migrations/0006_auto_20170711_0615.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/lms/djangoapps/email_marketing/migrations/0007_auto_20170809_0653.py b/lms/djangoapps/email_marketing/migrations/0007_auto_20170809_0653.py index e99d25e163..017c2eff9d 100644 --- a/lms/djangoapps/email_marketing/migrations/0007_auto_20170809_0653.py +++ b/lms/djangoapps/email_marketing/migrations/0007_auto_20170809_0653.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/lms/djangoapps/email_marketing/migrations/0008_auto_20170809_0539.py b/lms/djangoapps/email_marketing/migrations/0008_auto_20170809_0539.py index c4c580b867..653c6d2e68 100644 --- a/lms/djangoapps/email_marketing/migrations/0008_auto_20170809_0539.py +++ b/lms/djangoapps/email_marketing/migrations/0008_auto_20170809_0539.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/lms/djangoapps/email_marketing/migrations/0009_remove_emailmarketingconfiguration_sailthru_activation_template.py b/lms/djangoapps/email_marketing/migrations/0009_remove_emailmarketingconfiguration_sailthru_activation_template.py index 59fc491bce..9dbc041297 100644 --- a/lms/djangoapps/email_marketing/migrations/0009_remove_emailmarketingconfiguration_sailthru_activation_template.py +++ b/lms/djangoapps/email_marketing/migrations/0009_remove_emailmarketingconfiguration_sailthru_activation_template.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/lms/djangoapps/email_marketing/migrations/0010_auto_20180425_0800.py b/lms/djangoapps/email_marketing/migrations/0010_auto_20180425_0800.py index ff8daf7a1e..4514391dac 100644 --- a/lms/djangoapps/email_marketing/migrations/0010_auto_20180425_0800.py +++ b/lms/djangoapps/email_marketing/migrations/0010_auto_20180425_0800.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- # Generated by Django 1.11.12 on 2018-04-25 12:00 -from __future__ import unicode_literals +from __future__ import absolute_import, unicode_literals from django.db import migrations, models diff --git a/lms/djangoapps/email_marketing/tests/test_signals.py b/lms/djangoapps/email_marketing/tests/test_signals.py index 620d268602..b0d2bad972 100644 --- a/lms/djangoapps/email_marketing/tests/test_signals.py +++ b/lms/djangoapps/email_marketing/tests/test_signals.py @@ -1,4 +1,6 @@ """Tests of email marketing signal handlers.""" +from __future__ import absolute_import + import datetime import logging @@ -26,14 +28,14 @@ from email_marketing.tasks import ( _create_user_list, _get_list_from_email_marketing_provider, _get_or_create_user_list, - update_user, - update_user_email, get_email_cookies_via_sailthru, update_course_enrollment, + update_user, + update_user_email ) from openedx.core.djangoapps.lang_pref import LANGUAGE_KEY from student.models import Registration -from student.tests.factories import UserFactory, UserProfileFactory, CourseEnrollmentFactory +from student.tests.factories import CourseEnrollmentFactory, UserFactory, UserProfileFactory from util.json_request import JsonResponse log = logging.getLogger(__name__)