Merge pull request #20075 from edx/youngstrom/INCR-169

INCR-169

openedx/core/djangoapps/schedules/management/commands/__init__.py

@@ -1,3 +1,7 @@
+"""
+Base management command for sending emails
+"""
+from __future__ import absolute_import
 import datetime
 
 import pytz

openedx/core/djangoapps/schedules/management/commands/send_course_update.py

@@ -1,8 +1,13 @@
+"""
+Management command to send Schedule course updates
+"""
+from __future__ import absolute_import
 from openedx.core.djangoapps.schedules.management.commands import SendEmailBaseCommand
 from openedx.core.djangoapps.schedules.tasks import ScheduleCourseUpdate
+from six.moves import range
 
 
 class Command(SendEmailBaseCommand):
     async_send_task = ScheduleCourseUpdate
     log_prefix = 'Course Update'
-    offsets = xrange(-7, -77, -7)
+    offsets = range(-7, -77, -7)

openedx/core/djangoapps/schedules/management/commands/send_recurring_nudge.py

@@ -1,3 +1,7 @@
+"""
+Management command to send recurring Schedule nudges
+"""
+from __future__ import absolute_import
 from openedx.core.djangoapps.schedules.management.commands import SendEmailBaseCommand
 from openedx.core.djangoapps.schedules.tasks import ScheduleRecurringNudge
 

openedx/core/djangoapps/schedules/management/commands/send_upgrade_reminder.py

@@ -1,3 +1,7 @@
+"""
+A management command to send Schedule upgrade reminders
+"""
+from __future__ import absolute_import
 from openedx.core.djangoapps.schedules.management.commands import SendEmailBaseCommand
 from openedx.core.djangoapps.schedules.tasks import ScheduleUpgradeReminder
 

openedx/core/djangoapps/schedules/management/commands/setup_models_to_send_test_emails.py

@@ -2,6 +2,7 @@
 A managment command that can be used to set up Schedules with various configurations for testing.
 """
 
+from __future__ import absolute_import
 import datetime
 import pytz
 import factory

openedx/core/djangoapps/schedules/management/commands/tests/send_email_base.py

@@ -1,3 +1,7 @@
+"""
+Base file for testing email sending functionality
+"""
+from __future__ import absolute_import
 import datetime
 import logging
 from collections import namedtuple
@@ -27,6 +31,7 @@ from openedx.core.djangoapps.waffle_utils.testutils import WAFFLE_TABLES
 from openedx.core.djangolib.testing.utils import FilteredQueryCountMixin
 from student.models import CourseEnrollment
 from student.tests.factories import UserFactory
+from six.moves import range
 
 SITE_QUERY = 1  # django_site
 SITE_CONFIG_QUERY = 1  # site_configuration_siteconfiguration

openedx/core/djangoapps/schedules/management/commands/tests/test_send_course_update.py

@@ -1,6 +1,7 @@
 """
 Tests for send_course_update management command.
 """
+from __future__ import absolute_import
 import ddt
 from mock import patch, _is_started
 from unittest import skipUnless
@@ -22,6 +23,7 @@ from openedx.core.djangoapps.waffle_utils.testutils import override_waffle_flag
 from student.tests.factories import CourseEnrollmentFactory
 from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase
 from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
+from six.moves import range
 
 
 @ddt.ddt
@@ -40,7 +42,7 @@ class TestSendCourseUpdate(ScheduleUpsellTestMixin, ScheduleSendEmailTestMixin,
     command = nudge.Command
     deliver_config = 'deliver_course_update'
     enqueue_config = 'enqueue_course_update'
-    expected_offsets = range(-7, -77, -7)
+    expected_offsets = list(range(-7, -77, -7))
     experience_type = ScheduleExperience.EXPERIENCES.course_updates
 
     queries_deadline_for_each_course = True

openedx/core/djangoapps/schedules/management/commands/tests/test_send_email_base_command.py

@@ -1,3 +1,7 @@
+"""
+Tests for send_email_base_command
+"""
+from __future__ import absolute_import
 import datetime
 from unittest import skipUnless
 

openedx/core/djangoapps/schedules/management/commands/tests/test_send_recurring_nudge.py

@@ -1,6 +1,7 @@
 """
 Tests for send_recurring_nudge management command.
 """
+from __future__ import absolute_import
 from unittest import skipUnless
 
 import ddt

openedx/core/djangoapps/schedules/management/commands/tests/test_send_upgrade_reminder.py

@@ -1,6 +1,7 @@
 """
 Tests for send_upgrade_reminder management command.
 """
+from __future__ import absolute_import
 import logging
 from unittest import skipUnless
 
@@ -21,6 +22,7 @@ from openedx.core.djangoapps.schedules.management.commands.tests.send_email_base
 from openedx.core.djangoapps.schedules.models import ScheduleExperience
 from openedx.core.djangolib.testing.utils import skip_unless_lms, CacheIsolationTestCase
 from student.tests.factories import UserFactory
+from six.moves import range
 
 
 LOG = logging.getLogger(__name__)

openedx/core/djangoapps/schedules/management/commands/tests/upsell_base.py

@@ -1,3 +1,7 @@
+"""
+Base file for testing schedules with upsell
+"""
+from __future__ import absolute_import
 from collections import namedtuple
 import datetime
 import ddt