Consolidated imports

cms/djangoapps/contentstore/tests/test_contentstore.py

@@ -23,7 +23,7 @@ from xmodule.modulestore import Location
 from xmodule.modulestore.store_utilities import clone_course
 from xmodule.modulestore.store_utilities import delete_course
 from xmodule.modulestore.django import modulestore
-from xmodule.contentstore.django import contentstore
+from xmodule.contentstore.django import contentstore, _CONTENTSTORE
 from xmodule.templates import update_templates
 from xmodule.modulestore.xml_exporter import export_to_xml
 from xmodule.modulestore.xml_importer import import_from_xml, perform_xlint
@@ -41,7 +41,6 @@ from xmodule.exceptions import NotFoundError
 
 from django_comment_common.utils import are_permissions_roles_seeded
 from xmodule.exceptions import InvalidVersionError
-import xmodule.contentstore.django
 import datetime
 from pytz import UTC
 from uuid import uuid4
@@ -92,7 +91,7 @@ class ContentStoreToyCourseTest(ModuleStoreTestCase):
     def tearDown(self):
         mongo = MongoClient()
         mongo.drop_database(TEST_DATA_CONTENTSTORE['OPTIONS']['db'])
-        xmodule.contentstore.django._CONTENTSTORE.clear()
+        _CONTENTSTORE.clear()
 
     def check_components_on_page(self, component_types, expected_types):
         """
@@ -857,7 +856,7 @@ class ContentStoreTest(ModuleStoreTestCase):
     def tearDown(self):
         mongo = MongoClient()
         mongo.drop_database(TEST_DATA_CONTENTSTORE['OPTIONS']['db'])
-        xmodule.contentstore.django._CONTENTSTORE.clear()
+        _CONTENTSTORE.clear()
 
     def test_create_course(self):
         """Test new course creation - happy path"""