From b25e643176c155cb7be7fd6075b233ac44a0d073 Mon Sep 17 00:00:00 2001
From: Aarif <mraarif@outlook.com>
Date: Mon, 22 Jun 2020 17:28:52 +0500
Subject: [PATCH] Removed deprecated future imports
---
lti_consumer/lti.py | 2 --
lti_consumer/lti_consumer.py | 4 ++--
lti_consumer/oauth.py | 2 --
lti_consumer/outcomes.py | 5 +----
lti_consumer/tests/unit/test_lti.py | 4 +---
lti_consumer/tests/unit/test_lti_consumer.py | 2 --
lti_consumer/tests/unit/test_oauth.py | 2 --
lti_consumer/tests/unit/test_outcomes.py | 2 --
lti_consumer/tests/unit/test_utils.py | 2 --
setup.py | 3 +--
test.py | 9 ++++-----
11 files changed, 9 insertions(+), 28 deletions(-)
diff --git a/lti_consumer/lti.py b/lti_consumer/lti.py
index 7fac705..184b273 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 6f8ded9..5384111 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 7a01ebf..8bd5d89 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 049742a..ef1e347 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 f643253..332d242 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 c02ecf3..4241046 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 3186c38..738d7a6 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 56dd099..1e17e44 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 e328aea..7cf6564 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 01a6a99..74b419e 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 389fd40..efce05d 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
--
GitLab