From e304ab0c3f91f9ede93f5c8374373ab7239b5337 Mon Sep 17 00:00:00 2001 From: amitvadhel Date: Fri, 21 Jun 2019 13:41:23 +0300 Subject: [PATCH] INCR-475: Make compatible with Python 3.x --- lms/djangoapps/discussion/notification_prefs/tests.py | 10 ++++++++-- lms/djangoapps/program_enrollments/admin.py | 2 +- lms/djangoapps/program_enrollments/apps.py | 4 ++-- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lms/djangoapps/discussion/notification_prefs/tests.py b/lms/djangoapps/discussion/notification_prefs/tests.py index 2f5504f601..f014fa868e 100644 --- a/lms/djangoapps/discussion/notification_prefs/tests.py +++ b/lms/djangoapps/discussion/notification_prefs/tests.py @@ -1,18 +1,24 @@ # pylint: disable=missing-docstring,consider-iterating-dictionary +from __future__ import absolute_import + import json from django.contrib.auth.models import AnonymousUser from django.core.exceptions import PermissionDenied -from django.urls import reverse from django.http import Http404 from django.test import TestCase from django.test.client import RequestFactory from django.test.utils import override_settings +from django.urls import reverse from mock import patch from lms.djangoapps.discussion.notification_prefs import NOTIFICATION_PREF_KEY from lms.djangoapps.discussion.notification_prefs.views import ( - UsernameCipher, ajax_disable, ajax_enable, ajax_status, set_subscription, + UsernameCipher, + ajax_disable, + ajax_enable, + ajax_status, + set_subscription ) from openedx.core.djangoapps.user_api.models import UserPreference from student.tests.factories import UserFactory diff --git a/lms/djangoapps/program_enrollments/admin.py b/lms/djangoapps/program_enrollments/admin.py index cfbdf36255..aa79547bed 100644 --- a/lms/djangoapps/program_enrollments/admin.py +++ b/lms/djangoapps/program_enrollments/admin.py @@ -2,7 +2,7 @@ """ Admin tool for the Program Enrollments models """ -from __future__ import unicode_literals +from __future__ import absolute_import, unicode_literals from django.contrib import admin diff --git a/lms/djangoapps/program_enrollments/apps.py b/lms/djangoapps/program_enrollments/apps.py index c11bf14944..67d4eb3ee6 100644 --- a/lms/djangoapps/program_enrollments/apps.py +++ b/lms/djangoapps/program_enrollments/apps.py @@ -2,11 +2,11 @@ """ ProgramEnrollments Application Configuration """ -from __future__ import unicode_literals +from __future__ import absolute_import, unicode_literals from django.apps import AppConfig -from openedx.core.djangoapps.plugins.constants import ProjectType, PluginURLs +from openedx.core.djangoapps.plugins.constants import PluginURLs, ProjectType class ProgramEnrollmentsConfig(AppConfig):