diff --git a/cms/djangoapps/contentstore/tests/test_request_event.py b/cms/djangoapps/contentstore/tests/test_request_event.py index 6a513d689d..0126de66c6 100644 --- a/cms/djangoapps/contentstore/tests/test_request_event.py +++ b/cms/djangoapps/contentstore/tests/test_request_event.py @@ -3,7 +3,7 @@ import mock from django.test import TestCase from django.core.urlresolvers import reverse -from contentstore.views.requests import event as cms_user_track +from contentstore.views.helpers import event as cms_user_track class CMSLogTest(TestCase): diff --git a/cms/djangoapps/contentstore/views/__init__.py b/cms/djangoapps/contentstore/views/__init__.py index 10f6fb79a7..57e04f09d8 100644 --- a/cms/djangoapps/contentstore/views/__init__.py +++ b/cms/djangoapps/contentstore/views/__init__.py @@ -9,13 +9,13 @@ from .checklist import * from .component import * from .course import * from .error import * +from .helpers import * from .item import * from .import_export import * from .preview import * from .public import * from .user import * from .tabs import * -from .requests import * try: from .dev import * except ImportError: diff --git a/cms/djangoapps/contentstore/views/component.py b/cms/djangoapps/contentstore/views/component.py index deef87a403..6fd9d75628 100644 --- a/cms/djangoapps/contentstore/views/component.py +++ b/cms/djangoapps/contentstore/views/component.py @@ -26,7 +26,7 @@ from contentstore.utils import (get_modulestore, get_lms_link_for_item, from models.settings.course_grading import CourseGradingModel -from .requests import _xmodule_recurse +from .helpers import _xmodule_recurse from .access import has_access from xmodule.x_module import XModuleDescriptor from xblock.plugin import PluginMissingError diff --git a/cms/djangoapps/contentstore/views/requests.py b/cms/djangoapps/contentstore/views/helpers.py similarity index 100% rename from cms/djangoapps/contentstore/views/requests.py rename to cms/djangoapps/contentstore/views/helpers.py diff --git a/cms/djangoapps/contentstore/views/item.py b/cms/djangoapps/contentstore/views/item.py index c9edcd60a0..6313d520b8 100644 --- a/cms/djangoapps/contentstore/views/item.py +++ b/cms/djangoapps/contentstore/views/item.py @@ -12,7 +12,7 @@ from xmodule.modulestore.inheritance import own_metadata from util.json_request import expect_json, JsonResponse from ..utils import get_modulestore from .access import has_access -from .requests import _xmodule_recurse +from .helpers import _xmodule_recurse from xmodule.x_module import XModuleDescriptor __all__ = ['save_item', 'create_item', 'delete_item'] diff --git a/cms/djangoapps/contentstore/views/preview.py b/cms/djangoapps/contentstore/views/preview.py index eb2d92880d..03545c9077 100644 --- a/cms/djangoapps/contentstore/views/preview.py +++ b/cms/djangoapps/contentstore/views/preview.py @@ -22,7 +22,7 @@ from util.sandboxing import can_execute_unsafe_code import static_replace from .session_kv_store import SessionKeyValueStore -from .requests import render_from_lms +from .helpers import render_from_lms from .access import has_access from ..utils import get_course_for_item diff --git a/common/lib/xmodule/xmodule/modulestore/tests/test_publish.py b/common/lib/xmodule/xmodule/modulestore/tests/test_publish.py index 3b535c6738..99d0e8dbd3 100644 --- a/common/lib/xmodule/xmodule/modulestore/tests/test_publish.py +++ b/common/lib/xmodule/xmodule/modulestore/tests/test_publish.py @@ -129,7 +129,7 @@ class TestPublish(unittest.TestCase): """ Applies action depth-first down tree and to item last. - A copy of cms.djangoapps.contentstore.views.requests._xmodule_recurse to reproduce its use and behavior + A copy of cms.djangoapps.contentstore.views.helpers._xmodule_recurse to reproduce its use and behavior outside of django. """ for child in item.get_children():