Revert "Merge pull request #15170 from edx/jeskew/PLAT_1316_partitions_inheritance"

This reverts commit f97f052591, reversing
changes made to 800bcd8e20.

cms/djangoapps/contentstore/tests/test_course_settings.py

@@ -1,34 +1,35 @@
 """
 Tests for Studio Course Settings.
 """
-import copy
 import datetime
+import ddt
 import json
+import copy
+import mock
+from mock import Mock, patch
 import unittest
 
-import ddt
-import mock
-from contentstore.utils import reverse_course_url, reverse_usage_url
 from django.conf import settings
-from django.test.utils import override_settings
 from django.utils.timezone import UTC
-from milestones.tests.utils import MilestonesTestCaseMixin
-from mock import Mock, patch
+from django.test.utils import override_settings
+
+from contentstore.utils import reverse_course_url, reverse_usage_url
 from models.settings.course_grading import CourseGradingModel
 from models.settings.course_metadata import CourseMetadata
 from models.settings.encoder import CourseSettingsEncoder
-from openedx.core.djangoapps.models.course_details import CourseDetails
 from openedx.core.djangoapps.self_paced.models import SelfPacedConfiguration
-from openedx.core.lib.xblock_fields.fields import Date
+from openedx.core.djangoapps.models.course_details import CourseDetails
 from student.roles import CourseInstructorRole, CourseStaffRole
 from student.tests.factories import UserFactory
 from xblock_django.models import XBlockStudioConfigurationFlag
+from xmodule.fields import Date
 from xmodule.modulestore import ModuleStoreEnum
 from xmodule.modulestore.django import modulestore
 from xmodule.modulestore.tests.factories import CourseFactory
 from xmodule.tabs import InvalidTabsException
+from milestones.tests.utils import MilestonesTestCaseMixin
 
-from .utils import AjaxEnabledTestClient, CourseTestCase
+from .utils import CourseTestCase, AjaxEnabledTestClient
 
 
 def get_url(course_id, handler_name='settings_handler'):

cms/djangoapps/contentstore/tests/test_courseware_index.py

@@ -1,52 +1,52 @@
 """
 Testing indexing of the courseware as it is changed
 """
+import ddt
 import json
+from lazy.lazy import lazy
 import time
 from datetime import datetime
-from unittest import skip
-from uuid import uuid4
-
-import ddt
-from contentstore.courseware_index import (
-    CourseAboutSearchIndexer,
-    CoursewareSearchIndexer,
-    LibrarySearchIndexer,
-    SearchIndexingError
-)
-from contentstore.signals.handlers import listen_for_course_publish, listen_for_library_update
-from contentstore.tests.utils import CourseTestCase
-from contentstore.utils import reverse_course_url, reverse_usage_url
-from course_modes.models import CourseMode
 from dateutil.tz import tzutc
-from django.conf import settings
-from lazy.lazy import lazy
 from mock import patch
-from openedx.core.djangoapps.models.course_details import CourseDetails
-from openedx.core.lib.partitions.partitions import UserPartition
-from openedx.core.lib.xblock_fields.inherited_fields import InheritanceMixin
 from pytz import UTC
-from search.search_engine_base import SearchEngine
+from uuid import uuid4
+from unittest import skip
+
+from django.conf import settings
+
+from course_modes.models import CourseMode
+from openedx.core.djangoapps.models.course_details import CourseDetails
 from xmodule.library_tools import normalize_key_for_search
 from xmodule.modulestore import ModuleStoreEnum
 from xmodule.modulestore.django import SignalHandler, modulestore
 from xmodule.modulestore.edit_info import EditInfoMixin
+from xmodule.modulestore.inheritance import InheritanceMixin
 from xmodule.modulestore.mixed import MixedModuleStore
 from xmodule.modulestore.tests.django_utils import (
     TEST_DATA_MONGO_MODULESTORE,
     TEST_DATA_SPLIT_MODULESTORE,
-    SharedModuleStoreTestCase
-)
+    SharedModuleStoreTestCase)
 from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory, LibraryFactory
-from xmodule.modulestore.tests.mongo_connection import MONGO_HOST, MONGO_PORT_NUM
+from xmodule.modulestore.tests.mongo_connection import MONGO_PORT_NUM, MONGO_HOST
 from xmodule.modulestore.tests.utils import (
-    LocationMixin,
-    MixedSplitTestCase,
-    MongoContentstoreBuilder,
-    create_modulestore_instance
+    create_modulestore_instance, LocationMixin,
+    MixedSplitTestCase, MongoContentstoreBuilder
 )
 from xmodule.tests import DATA_DIR
 from xmodule.x_module import XModuleMixin
+from xmodule.partitions.partitions import UserPartition
+
+from search.search_engine_base import SearchEngine
+
+from contentstore.courseware_index import (
+    CoursewareSearchIndexer,
+    LibrarySearchIndexer,
+    SearchIndexingError,
+    CourseAboutSearchIndexer,
+)
+from contentstore.signals.handlers import listen_for_course_publish, listen_for_library_update
+from contentstore.utils import reverse_course_url, reverse_usage_url
+from contentstore.tests.utils import CourseTestCase
 
 COURSE_CHILD_STRUCTURE = {
     "course": "chapter",

cms/djangoapps/contentstore/tests/test_utils.py

@@ -2,17 +2,19 @@
 import collections
 from datetime import datetime, timedelta
 
+from pytz import UTC
+from django.test import TestCase
+from xmodule.modulestore import ModuleStoreEnum
+from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
+from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase, SharedModuleStoreTestCase
+from opaque_keys.edx.locations import SlashSeparatedCourseKey
+from xmodule.modulestore.django import modulestore
+from xmodule.partitions.partitions import UserPartition, Group
+
+from openedx.core.djangoapps.site_configuration.tests.test_util import with_site_configuration_context
+
 from contentstore import utils
 from contentstore.tests.utils import CourseTestCase
-from django.test import TestCase
-from opaque_keys.edx.locations import SlashSeparatedCourseKey
-from openedx.core.djangoapps.site_configuration.tests.test_util import with_site_configuration_context
-from openedx.core.lib.partitions.partitions import Group, UserPartition
-from pytz import UTC
-from xmodule.modulestore import ModuleStoreEnum
-from xmodule.modulestore.django import modulestore
-from xmodule.modulestore.tests.django_utils import ModuleStoreTestCase, SharedModuleStoreTestCase
-from xmodule.modulestore.tests.factories import CourseFactory, ItemFactory
 
 
 class LMSLinksTestCase(TestCase):