diff --git a/lms/djangoapps/email_marketing/admin.py b/lms/djangoapps/email_marketing/admin.py index ce338c1974..d877c2905a 100644 --- a/lms/djangoapps/email_marketing/admin.py +++ b/lms/djangoapps/email_marketing/admin.py @@ -1,5 +1,7 @@ """ Admin site bindings for email marketing """ +from __future__ import absolute_import + from config_models.admin import ConfigurationModelAdmin from django.contrib import admin diff --git a/lms/djangoapps/email_marketing/apps.py b/lms/djangoapps/email_marketing/apps.py index 89f4c97bfc..8ccb836709 100644 --- a/lms/djangoapps/email_marketing/apps.py +++ b/lms/djangoapps/email_marketing/apps.py @@ -1,6 +1,8 @@ """ Configuration for the email_marketing Django application. """ +from __future__ import absolute_import + from django.apps import AppConfig diff --git a/lms/djangoapps/email_marketing/signals.py b/lms/djangoapps/email_marketing/signals.py index 0810ca62a4..32cc251afe 100644 --- a/lms/djangoapps/email_marketing/signals.py +++ b/lms/djangoapps/email_marketing/signals.py @@ -1,6 +1,8 @@ """ This module contains signals needed for email integration """ +from __future__ import absolute_import + import datetime import logging from random import randint @@ -16,8 +18,8 @@ import third_party_auth from course_modes.models import CourseMode from email_marketing.models import EmailMarketingConfiguration from lms.djangoapps.email_marketing.tasks import get_email_cookies_via_sailthru, update_user, update_user_email -from openedx.core.djangoapps.user_authn.cookies import CREATE_LOGON_COOKIE from openedx.core.djangoapps.lang_pref import LANGUAGE_KEY +from openedx.core.djangoapps.user_authn.cookies import CREATE_LOGON_COOKIE from openedx.core.djangoapps.user_authn.views.register import REGISTER_USER from openedx.core.djangoapps.waffle_utils import WaffleSwitchNamespace from student.signals import SAILTHRU_AUDIT_PURCHASE diff --git a/lms/djangoapps/email_marketing/tasks.py b/lms/djangoapps/email_marketing/tasks.py index 09ced306c9..6309dc2d23 100644 --- a/lms/djangoapps/email_marketing/tasks.py +++ b/lms/djangoapps/email_marketing/tasks.py @@ -2,10 +2,13 @@ This file contains celery tasks for email marketing signal handler. """ +from __future__ import absolute_import + import logging import time from datetime import datetime, timedelta +import six from celery import task from django.conf import settings from django.core.cache import cache @@ -42,7 +45,7 @@ def get_email_cookies_via_sailthru(self, user_email, post_parms): ) sailthru_response = sailthru_client.api_post("user", post_parms) except SailthruClientError as exc: - log.error(u"Exception attempting to obtain cookie from Sailthru: %s", unicode(exc)) + log.error(u"Exception attempting to obtain cookie from Sailthru: %s", six.text_type(exc)) raise SailthruClientError if sailthru_response.is_ok(): @@ -87,7 +90,7 @@ def update_user(self, sailthru_vars, email, site=None, new_user=False, activatio site=site)) except SailthruClientError as exc: - log.error(u"Exception attempting to add/update user %s in Sailthru - %s", email, unicode(exc)) + log.error(u"Exception attempting to add/update user %s in Sailthru - %s", email, six.text_type(exc)) raise self.retry(exc=exc, countdown=email_config.sailthru_retry_interval, max_retries=email_config.sailthru_max_retries) @@ -113,7 +116,11 @@ def update_user(self, sailthru_vars, email, site=None, new_user=False, activatio } ) except SailthruClientError as exc: - log.error(u"Exception attempting to send welcome email to user %s in Sailthru - %s", email, unicode(exc)) + log.error( + u"Exception attempting to send welcome email to user %s in Sailthru - %s", + email, + six.text_type(exc) + ) raise self.retry(exc=exc, countdown=email_config.sailthru_retry_interval, max_retries=email_config.sailthru_max_retries) @@ -161,7 +168,7 @@ def update_user_email(self, new_email, old_email): sailthru_client = SailthruClient(email_config.sailthru_key, email_config.sailthru_secret) sailthru_response = sailthru_client.api_post("user", sailthru_parms) except SailthruClientError as exc: - log.error(u"Exception attempting to update email for %s in Sailthru - %s", old_email, unicode(exc)) + log.error(u"Exception attempting to update email for %s in Sailthru - %s", old_email, six.text_type(exc)) raise self.retry(exc=exc, countdown=email_config.sailthru_retry_interval, max_retries=email_config.sailthru_max_retries) @@ -247,7 +254,7 @@ def _get_list_from_email_marketing_provider(sailthru_client): try: sailthru_get_response = sailthru_client.api_get("list", {}) except SailthruClientError as exc: - log.error(u"Exception attempting to get list from Sailthru - %s", unicode(exc)) + log.error(u"Exception attempting to get list from Sailthru - %s", six.text_type(exc)) return {} if not sailthru_get_response.is_ok(): @@ -273,7 +280,7 @@ def _create_user_list(sailthru_client, list_name): try: sailthru_response = sailthru_client.api_post("list", list_params) except SailthruClientError as exc: - log.error(u"Exception attempting to list record for key %s in Sailthru - %s", list_name, unicode(exc)) + log.error(u"Exception attempting to list record for key %s in Sailthru - %s", list_name, six.text_type(exc)) return False if not sailthru_response.is_ok(): @@ -347,7 +354,7 @@ def build_course_url(course_key): a complete url of the course info page """ return '{base_url}/courses/{course_key}/info'.format(base_url=settings.LMS_ROOT_URL, - course_key=unicode(course_key)) + course_key=six.text_type(course_key)) def update_unenrolled_list(sailthru_client, email, course_url, unenroll): @@ -400,7 +407,7 @@ def update_unenrolled_list(sailthru_client, email, course_url, unenroll): return True except SailthruClientError as exc: - log.exception(u"Exception attempting to update user record for %s in Sailthru - %s", email, unicode(exc)) + log.exception(u"Exception attempting to update user record for %s in Sailthru - %s", email, six.text_type(exc)) return False @@ -463,7 +470,7 @@ def _build_purchase_item(course_id, course_url, cost_in_cents, mode, course_data item['tags'] = course_data['tags'] # add vars to item - item['vars'] = dict(course_data.get('vars', {}), mode=mode, course_run_id=unicode(course_id)) + item['vars'] = dict(course_data.get('vars', {}), mode=mode, course_run_id=six.text_type(course_id)) return item @@ -489,6 +496,6 @@ def _record_purchase(sailthru_client, email, item, options): return not _retryable_sailthru_error(error) except SailthruClientError as exc: - log.exception(u"Exception attempting to record purchase for %s in Sailthru - %s", email, unicode(exc)) + log.exception(u"Exception attempting to record purchase for %s in Sailthru - %s", email, six.text_type(exc)) return False return True diff --git a/lms/djangoapps/lti_provider/migrations/0001_initial.py b/lms/djangoapps/lti_provider/migrations/0001_initial.py index 5fbbf3b015..e1c4e81069 100644 --- a/lms/djangoapps/lti_provider/migrations/0001_initial.py +++ b/lms/djangoapps/lti_provider/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 provider.utils from django.conf import settings +from django.db import migrations, models from opaque_keys.edx.django.models import CourseKeyField, UsageKeyField diff --git a/lms/djangoapps/lti_provider/migrations/0002_auto_20160325_0407.py b/lms/djangoapps/lti_provider/migrations/0002_auto_20160325_0407.py index 232a1e6c00..f3383de1c4 100644 --- a/lms/djangoapps/lti_provider/migrations/0002_auto_20160325_0407.py +++ b/lms/djangoapps/lti_provider/migrations/0002_auto_20160325_0407.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 provider.utils +from django.db import migrations, models class Migration(migrations.Migration): diff --git a/lms/djangoapps/lti_provider/migrations/0003_auto_20161118_1040.py b/lms/djangoapps/lti_provider/migrations/0003_auto_20161118_1040.py index 394439e891..a0ae188286 100644 --- a/lms/djangoapps/lti_provider/migrations/0003_auto_20161118_1040.py +++ b/lms/djangoapps/lti_provider/migrations/0003_auto_20161118_1040.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- -from __future__ import unicode_literals +from __future__ import absolute_import, unicode_literals from django.db import migrations, models + import openedx.core.djangolib.fields diff --git a/lms/djangoapps/mobile_api/users/views.py b/lms/djangoapps/mobile_api/users/views.py index 231eda9238..9c89da99e0 100644 --- a/lms/djangoapps/mobile_api/users/views.py +++ b/lms/djangoapps/mobile_api/users/views.py @@ -4,8 +4,6 @@ Views for user API from __future__ import absolute_import -import json - import six from django.shortcuts import redirect from django.utils import dateparse