From f31a89490004e96219fa1aab1a08b244746ad90e Mon Sep 17 00:00:00 2001 From: Amit <43564590+amitvadhel@users.noreply.github.com> Date: Wed, 10 Jul 2019 17:22:47 +0300 Subject: [PATCH] INCR-457: Make compatible with Python 3.x (#21011) --- lms/djangoapps/mobile_api/course_info/tests.py | 8 +++++--- lms/djangoapps/mobile_api/course_info/urls.py | 2 ++ lms/djangoapps/mobile_api/course_info/views.py | 2 ++ lms/djangoapps/mobile_api/middleware.py | 2 ++ lms/djangoapps/mobile_api/models.py | 2 ++ lms/djangoapps/mobile_api/urls.py | 2 ++ lms/djangoapps/mobile_api/utils.py | 2 ++ 7 files changed, 17 insertions(+), 3 deletions(-) diff --git a/lms/djangoapps/mobile_api/course_info/tests.py b/lms/djangoapps/mobile_api/course_info/tests.py index d0a3a9e758..68dba641e4 100644 --- a/lms/djangoapps/mobile_api/course_info/tests.py +++ b/lms/djangoapps/mobile_api/course_info/tests.py @@ -2,18 +2,20 @@ Tests for course_info """ +from __future__ import absolute_import + import ddt from django.conf import settings from milestones.tests.utils import MilestonesTestCaseMixin +from six.moves import range +from mobile_api.testutils import MobileAPITestCase, MobileAuthTestMixin, MobileCourseAccessTestMixin +from mobile_api.utils import API_V1, API_V05 from xmodule.html_module import CourseInfoModule from xmodule.modulestore import ModuleStoreEnum from xmodule.modulestore.django import modulestore from xmodule.modulestore.xml_importer import import_course_from_xml -from mobile_api.testutils import MobileAPITestCase, MobileAuthTestMixin, MobileCourseAccessTestMixin -from mobile_api.utils import API_V05, API_V1 - @ddt.ddt class TestUpdates(MobileAPITestCase, MobileAuthTestMixin, MobileCourseAccessTestMixin, MilestonesTestCaseMixin): diff --git a/lms/djangoapps/mobile_api/course_info/urls.py b/lms/djangoapps/mobile_api/course_info/urls.py index 9af6f0021e..b279e1d5f0 100644 --- a/lms/djangoapps/mobile_api/course_info/urls.py +++ b/lms/djangoapps/mobile_api/course_info/urls.py @@ -2,6 +2,8 @@ URLs for course_info API """ +from __future__ import absolute_import + from django.conf import settings from django.conf.urls import url diff --git a/lms/djangoapps/mobile_api/course_info/views.py b/lms/djangoapps/mobile_api/course_info/views.py index a4a31bfe11..7e8d527195 100644 --- a/lms/djangoapps/mobile_api/course_info/views.py +++ b/lms/djangoapps/mobile_api/course_info/views.py @@ -2,6 +2,8 @@ Views for course info API """ +from __future__ import absolute_import + from rest_framework import generics from rest_framework.response import Response diff --git a/lms/djangoapps/mobile_api/middleware.py b/lms/djangoapps/mobile_api/middleware.py index 15b403f432..a38f4044dc 100644 --- a/lms/djangoapps/mobile_api/middleware.py +++ b/lms/djangoapps/mobile_api/middleware.py @@ -1,6 +1,8 @@ """ Middleware for Mobile APIs """ +from __future__ import absolute_import + from datetime import datetime from django.conf import settings diff --git a/lms/djangoapps/mobile_api/models.py b/lms/djangoapps/mobile_api/models.py index 34043a9d04..bb8c023183 100644 --- a/lms/djangoapps/mobile_api/models.py +++ b/lms/djangoapps/mobile_api/models.py @@ -1,6 +1,8 @@ """ ConfigurationModel for the mobile_api djangoapp. """ +from __future__ import absolute_import + from config_models.models import ConfigurationModel from django.db import models diff --git a/lms/djangoapps/mobile_api/urls.py b/lms/djangoapps/mobile_api/urls.py index 8d7984532f..67b9e778b1 100644 --- a/lms/djangoapps/mobile_api/urls.py +++ b/lms/djangoapps/mobile_api/urls.py @@ -2,6 +2,8 @@ URLs for mobile API """ +from __future__ import absolute_import + from django.conf.urls import include, url from .users.views import my_user_info diff --git a/lms/djangoapps/mobile_api/utils.py b/lms/djangoapps/mobile_api/utils.py index b923d0e5ef..07b237d206 100644 --- a/lms/djangoapps/mobile_api/utils.py +++ b/lms/djangoapps/mobile_api/utils.py @@ -1,6 +1,8 @@ """ Common utility methods for Mobile APIs. """ +from six.moves import map + API_V05 = 'v0.5' API_V1 = 'v1'