Removed deprecated future imports (#130)

openedx · Jun 28, 2020 · 36ae1b3 · 36ae1b3
2 parents f90e5fd + 6e2f19d
commit 36ae1b3
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 18 deletions.
diff --git a/opaque_keys/edx/locations.py b/opaque_keys/edx/locations.py
@@ -1,7 +1,6 @@
 """
 Deprecated OpaqueKey implementations used by XML and Mongo modulestores
 """
-from __future__ import absolute_import
 
 import re
 import warnings

diff --git a/opaque_keys/edx/locator.py b/opaque_keys/edx/locator.py
@@ -2,20 +2,18 @@
 Identifier for course resources.
 """
 
-from __future__ import absolute_import
-
 import inspect
 import logging
 import re
-from uuid import UUID
 import warnings
+from uuid import UUID
 
+import six
 from bson.errors import InvalidId
 from bson.objectid import ObjectId
 from bson.son import SON
-
-import six
 from six import string_types, text_type
+
 from opaque_keys import OpaqueKey, InvalidKeyError
 from opaque_keys.edx.keys import AssetKey, CourseKey, DefinitionKey, LearningContextKey, UsageKey, UsageKeyV2
 

diff --git a/opaque_keys/edx/tests/test_is_course.py b/opaque_keys/edx/tests/test_is_course.py
@@ -1,7 +1,7 @@
 """
 Test that the .is_course helper property does what it's supposed to
 """
-from __future__ import absolute_import, division, print_function, unicode_literals
+
 from unittest import TestCase
 
 from opaque_keys.edx.locator import CourseLocator, LibraryLocator, LibraryLocatorV2

diff --git a/opaque_keys/edx/tests/test_library_locators.py b/opaque_keys/edx/tests/test_library_locators.py
@@ -2,20 +2,17 @@
 """
 Tests of LibraryLocators
 """
-from __future__ import absolute_import, division, print_function, unicode_literals
-from unittest import TestCase
 
-from six import text_type
-import ddt
 import itertools  # pylint: disable=wrong-import-order
+from unittest import TestCase
 
+import ddt
 from bson.objectid import ObjectId
+from six import text_type
 
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.keys import CourseKey, LearningContextKey
-
 from opaque_keys.edx.locator import LibraryUsageLocator, LibraryLocator, LibraryLocatorV2, CourseLocator, AssetLocator
-
 from opaque_keys.edx.tests import LocatorBaseTest, TestDeprecated
 
 

diff --git a/opaque_keys/edx/tests/test_library_usage_locators.py b/opaque_keys/edx/tests/test_library_usage_locators.py
@@ -2,13 +2,14 @@
 """
 Tests of LibraryUsageLocator
 """
-from __future__ import absolute_import, division, print_function, unicode_literals
+
 import itertools  # pylint: disable=wrong-import-order
 from unittest import TestCase
 
 import ddt
-from six import text_type
 from bson.objectid import ObjectId
+from six import text_type
+
 from opaque_keys import InvalidKeyError
 from opaque_keys.edx.keys import UsageKey
 from opaque_keys.edx.locator import (

diff --git a/opaque_keys/edx/tests/test_locators.py b/opaque_keys/edx/tests/test_locators.py
@@ -2,18 +2,18 @@
 """
 Tests for opaque_keys.edx.locator.
 """
-from __future__ import absolute_import, division, print_function, unicode_literals
+
 import random
 from unittest import TestCase
 from uuid import UUID
 
 import ddt
-from six import text_type
 from bson.objectid import ObjectId
+from six import text_type
 
 from opaque_keys import InvalidKeyError
-from opaque_keys.edx.locator import Locator, BundleDefinitionLocator, CourseLocator, DefinitionLocator, VersionTree
 from opaque_keys.edx.keys import DefinitionKey
+from opaque_keys.edx.locator import Locator, BundleDefinitionLocator, CourseLocator, DefinitionLocator, VersionTree
 
 
 class LocatorTests(TestCase):