diff --git a/lti_consumer/lti.py b/lti_consumer/lti.py index 7fac705622a420135972e40cf64bcd2318e83682..184b2735d57b558ffdb5644cdc2c67b1e7990c44 100644 --- a/lti_consumer/lti.py +++ b/lti_consumer/lti.py @@ -5,8 +5,6 @@ For more details see: https://www.imsglobal.org/activity/learning-tools-interoperability """ -from __future__ import absolute_import, unicode_literals - import json import logging diff --git a/lti_consumer/lti_consumer.py b/lti_consumer/lti_consumer.py index 6f8ded93d94cc0b464fc683d605faecc298ca31b..5384111e3f21c6cacb58a992e4d55752ce780901 100644 --- a/lti_consumer/lti_consumer.py +++ b/lti_consumer/lti_consumer.py @@ -58,11 +58,11 @@ import uuid from collections import namedtuple from importlib import import_module -import bleach import six from six.moves.urllib import parse -from Crypto.PublicKey import RSA from django.utils import timezone +import bleach +from Crypto.PublicKey import RSA from webob import Response from xblock.core import List, Scope, String, XBlock from xblock.fields import Boolean, Float, Integer diff --git a/lti_consumer/oauth.py b/lti_consumer/oauth.py index 7a01ebf0892ba69578f20cc4d0cbcdda81726854..8bd5d890ef8c6609a285255a79ce5dfbd421420f 100644 --- a/lti_consumer/oauth.py +++ b/lti_consumer/oauth.py @@ -2,8 +2,6 @@ Utility functions for working with OAuth signatures. """ -from __future__ import absolute_import, unicode_literals - import base64 import hashlib import logging diff --git a/lti_consumer/outcomes.py b/lti_consumer/outcomes.py index 049742aa9eb46520c88da534ae74fc5ab852370e..ef1e3477c8efe57ed3346d1aee4c047f69f821c9 100644 --- a/lti_consumer/outcomes.py +++ b/lti_consumer/outcomes.py @@ -5,18 +5,15 @@ For more details see: https://www.imsglobal.org/specs/ltiomv1p0 """ -from __future__ import absolute_import, unicode_literals - import logging from xml.sax.saxutils import escape import six.moves.urllib.error import six.moves.urllib.parse -from six import text_type from lxml import etree +from six import text_type from xblockutils.resources import ResourceLoader - from .exceptions import LtiError from .oauth import verify_oauth_body_signature diff --git a/lti_consumer/tests/unit/test_lti.py b/lti_consumer/tests/unit/test_lti.py index f643253d58251bd7ba1bf169674782b4f9893d35..332d242616d99b2c18cd7081052b3286723aa297 100644 --- a/lti_consumer/tests/unit/test_lti.py +++ b/lti_consumer/tests/unit/test_lti.py @@ -3,15 +3,13 @@ Unit tests for lti_consumer.lti module """ -from __future__ import absolute_import, unicode_literals - import unittest from datetime import timedelta +import six from django.utils import timezone from mock import Mock, PropertyMock, patch from six import text_type -import six from lti_consumer.exceptions import LtiError from lti_consumer.lti import LtiConsumer, parse_result_json diff --git a/lti_consumer/tests/unit/test_lti_consumer.py b/lti_consumer/tests/unit/test_lti_consumer.py index c02ecf373384b97e9d3287742e97e7a610b60332..42410468a8aee7375b447cc041465ee54b23f06e 100644 --- a/lti_consumer/tests/unit/test_lti_consumer.py +++ b/lti_consumer/tests/unit/test_lti_consumer.py @@ -2,8 +2,6 @@ Unit tests for LtiConsumerXBlock """ -from __future__ import absolute_import - from datetime import timedelta import json import uuid diff --git a/lti_consumer/tests/unit/test_oauth.py b/lti_consumer/tests/unit/test_oauth.py index 3186c384d3daa5cec7b6d517d17fe98846826c0d..738d7a6338e3da06d33b2a3e3ed106dd87fdf5ca 100644 --- a/lti_consumer/tests/unit/test_oauth.py +++ b/lti_consumer/tests/unit/test_oauth.py @@ -2,8 +2,6 @@ Unit tests for lti_consumer.oauth module """ -from __future__ import absolute_import - import unittest from mock import Mock, patch diff --git a/lti_consumer/tests/unit/test_outcomes.py b/lti_consumer/tests/unit/test_outcomes.py index 56dd099643a59c9631971a78aa937538c3455aaa..1e17e44f2248d67300ed2042795221a765f7ba46 100644 --- a/lti_consumer/tests/unit/test_outcomes.py +++ b/lti_consumer/tests/unit/test_outcomes.py @@ -3,8 +3,6 @@ Unit tests for lti_consumer.outcomes module """ -from __future__ import absolute_import, unicode_literals - import textwrap import unittest from copy import copy diff --git a/lti_consumer/tests/unit/test_utils.py b/lti_consumer/tests/unit/test_utils.py index e328aeabf913791e9f46f4252bf997969516b321..7cf6564db0ada06cbe9b534cf5dae6ccd1e2c4e4 100644 --- a/lti_consumer/tests/unit/test_utils.py +++ b/lti_consumer/tests/unit/test_utils.py @@ -2,8 +2,6 @@ Utility functions used within unit tests """ -from __future__ import absolute_import - import six from mock import Mock, PropertyMock, patch from webob import Request diff --git a/setup.py b/setup.py index 01a6a99ea412757885b8dced6325fd03e395e5e3..74b419e277aab9b55b05066655be2cdd37cbb266 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,5 @@ """Setup for lti_consumer XBlock.""" -from __future__ import absolute_import - import os from setuptools import setup @@ -22,6 +20,7 @@ def package_data(pkg, roots): return {pkg: data} + def load_requirements(*requirements_paths): """ Load all requirements from the specified requirements files. diff --git a/test.py b/test.py index 389fd40e5672be31798edf5a823d1c2a3b57915d..efce05d858e922d0186df9fe3db7e6dd2baaec28 100644 --- a/test.py +++ b/test.py @@ -3,7 +3,6 @@ """ Run tests for the LTI Consumer XBlock """ -from __future__ import absolute_import import os import sys @@ -12,7 +11,7 @@ if __name__ == '__main__': os.environ.setdefault('DJANGO_SETTINGS_MODULE', u'workbench.settings') try: - from django.conf import settings # pylint: disable=wrong-import-position + from django.conf import settings # pylint: disable=wrong-import-position from django.core.management import execute_from_command_line # pylint: disable=wrong-import-position except ImportError: # The above import may fail for some other reason. Ensure that the @@ -22,9 +21,9 @@ if __name__ == '__main__': import django # pylint: disable=unused-import, wrong-import-position except ImportError: raise ImportError( - "Couldn't import Django. Are you sure it's installed and " - "available on your PYTHONPATH environment variable? Did you " - "forget to activate a virtual environment?" + "Couldn't import Django. Are you sure it's installed and " + "available on your PYTHONPATH environment variable? Did you " + "forget to activate a virtual environment?" ) raise