From 8860317772ed65778a1ddea0110862a31002b8cf Mon Sep 17 00:00:00 2001 From: Amit <43564590+amitvadhel@users.noreply.github.com> Date: Thu, 11 Jul 2019 18:17:47 +0300 Subject: [PATCH] INCR-455: Updates on Python 3.x (#21057) --- lms/djangoapps/lti_provider/admin.py | 2 ++ lms/djangoapps/lti_provider/apps.py | 2 ++ lms/djangoapps/lti_provider/models.py | 2 ++ lms/djangoapps/lti_provider/outcomes.py | 2 ++ lms/djangoapps/lti_provider/signature_validator.py | 5 ++++- lms/djangoapps/lti_provider/tasks.py | 2 ++ lms/djangoapps/lti_provider/urls.py | 2 ++ 7 files changed, 16 insertions(+), 1 deletion(-) diff --git a/lms/djangoapps/lti_provider/admin.py b/lms/djangoapps/lti_provider/admin.py index 43aa7dac29..54d0b31349 100644 --- a/lms/djangoapps/lti_provider/admin.py +++ b/lms/djangoapps/lti_provider/admin.py @@ -2,6 +2,8 @@ Admin interface for LTI Provider app. """ +from __future__ import absolute_import + from django.contrib import admin from .models import LtiConsumer diff --git a/lms/djangoapps/lti_provider/apps.py b/lms/djangoapps/lti_provider/apps.py index 931806b315..b41fbb1a1d 100644 --- a/lms/djangoapps/lti_provider/apps.py +++ b/lms/djangoapps/lti_provider/apps.py @@ -1,6 +1,8 @@ """ Configuration for the lti_provider Django application. """ +from __future__ import absolute_import + from django.apps import AppConfig diff --git a/lms/djangoapps/lti_provider/models.py b/lms/djangoapps/lti_provider/models.py index 06965f9c9d..086d20cda0 100644 --- a/lms/djangoapps/lti_provider/models.py +++ b/lms/djangoapps/lti_provider/models.py @@ -8,6 +8,8 @@ changes. To do that, 1. Go to the edx-platform dir 2. ./manage.py lms schemamigration lti_provider --auto "description" --settings=devstack """ +from __future__ import absolute_import + import logging from django.contrib.auth.models import User diff --git a/lms/djangoapps/lti_provider/outcomes.py b/lms/djangoapps/lti_provider/outcomes.py index 892dac39a6..3389735c32 100644 --- a/lms/djangoapps/lti_provider/outcomes.py +++ b/lms/djangoapps/lti_provider/outcomes.py @@ -3,6 +3,8 @@ Helper functions for managing interactions with the LTI outcomes service defined in LTI v1.1. """ +from __future__ import absolute_import + import logging import uuid diff --git a/lms/djangoapps/lti_provider/signature_validator.py b/lms/djangoapps/lti_provider/signature_validator.py index d61276489d..c42aff30e4 100644 --- a/lms/djangoapps/lti_provider/signature_validator.py +++ b/lms/djangoapps/lti_provider/signature_validator.py @@ -2,6 +2,9 @@ Subclass of oauthlib's RequestValidator that checks an OAuth signature. """ +from __future__ import absolute_import + +import six from oauthlib.oauth1 import RequestValidator, SignatureOnlyEndpoint @@ -97,7 +100,7 @@ class SignatureValidator(RequestValidator): :return: True if the signature matches, False if it does not. """ - method = unicode(request.method) + method = six.text_type(request.method) url = request.build_absolute_uri() body = request.body diff --git a/lms/djangoapps/lti_provider/tasks.py b/lms/djangoapps/lti_provider/tasks.py index 1aeb71c51a..d9f2d08151 100644 --- a/lms/djangoapps/lti_provider/tasks.py +++ b/lms/djangoapps/lti_provider/tasks.py @@ -2,6 +2,8 @@ Asynchronous tasks for the LTI provider app. """ +from __future__ import absolute_import + import logging from django.contrib.auth.models import User diff --git a/lms/djangoapps/lti_provider/urls.py b/lms/djangoapps/lti_provider/urls.py index e71eab974e..6fe617fa37 100644 --- a/lms/djangoapps/lti_provider/urls.py +++ b/lms/djangoapps/lti_provider/urls.py @@ -2,6 +2,8 @@ LTI Provider API endpoint urls. """ +from __future__ import absolute_import + from django.conf import settings from django.conf.urls import url