From 27c99e1cf2f8e92f98b7ac9aaaabe8267f5bd962 Mon Sep 17 00:00:00 2001
From: Nimisha Asthagiri <nasthagiri@edx.org>
Date: Fri, 7 Oct 2016 13:04:23 -0400
Subject: [PATCH] Move header_control from common to openedx/core
---
cms/envs/common.py | 2 +-
lms/envs/common.py | 2 +-
openedx/core/djangoapps/contentserver/middleware.py | 2 +-
.../core}/djangoapps/header_control/__init__.py | 0
.../core}/djangoapps/header_control/decorators.py | 2 +-
.../core}/djangoapps/header_control/middleware.py | 0
.../core}/djangoapps/header_control/tests/__init__.py | 0
.../core}/djangoapps/header_control/tests/test_decorators.py | 3 ++-
.../core}/djangoapps/header_control/tests/test_middleware.py | 5 +++--
9 files changed, 9 insertions(+), 7 deletions(-)
rename {common => openedx/core}/djangoapps/header_control/__init__.py (100%)
rename {common => openedx/core}/djangoapps/header_control/decorators.py (94%)
rename {common => openedx/core}/djangoapps/header_control/middleware.py (100%)
rename {common => openedx/core}/djangoapps/header_control/tests/__init__.py (100%)
rename {common => openedx/core}/djangoapps/header_control/tests/test_decorators.py (91%)
rename {common => openedx/core}/djangoapps/header_control/tests/test_middleware.py (93%)
diff --git a/cms/envs/common.py b/cms/envs/common.py
index d18d6d1a4f7..af72895c182 100644
--- a/cms/envs/common.py
+++ b/cms/envs/common.py
@@ -335,7 +335,7 @@ simplefilter('ignore')
MIDDLEWARE_CLASSES = (
'crum.CurrentRequestUserMiddleware',
'request_cache.middleware.RequestCache',
- 'header_control.middleware.HeaderControlMiddleware',
+ 'openedx.core.djangoapps.header_control.middleware.HeaderControlMiddleware',
'django.middleware.cache.UpdateCacheMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
diff --git a/lms/envs/common.py b/lms/envs/common.py
index 325f8bf498c..9af1416c4df 100644
--- a/lms/envs/common.py
+++ b/lms/envs/common.py
@@ -1088,7 +1088,7 @@ MIDDLEWARE_CLASSES = (
'request_cache.middleware.RequestCache',
'mobile_api.middleware.AppVersionUpgrade',
- 'header_control.middleware.HeaderControlMiddleware',
+ 'openedx.core.djangoapps.header_control.middleware.HeaderControlMiddleware',
'microsite_configuration.middleware.MicrositeMiddleware',
'django_comment_client.middleware.AjaxExceptionMiddleware',
'django.middleware.common.CommonMiddleware',
diff --git a/openedx/core/djangoapps/contentserver/middleware.py b/openedx/core/djangoapps/contentserver/middleware.py
index 369639702df..9fb41c08b59 100644
--- a/openedx/core/djangoapps/contentserver/middleware.py
+++ b/openedx/core/djangoapps/contentserver/middleware.py
@@ -10,12 +10,12 @@ from django.http import (
HttpResponseBadRequest, HttpResponseNotFound, HttpResponsePermanentRedirect)
from student.models import CourseEnrollment
-from header_control import force_header_for_response
from xmodule.assetstore.assetmgr import AssetManager
from xmodule.contentstore.content import StaticContent, XASSET_LOCATION_TAG
from xmodule.modulestore import InvalidLocationError
from opaque_keys import InvalidKeyError
from opaque_keys.edx.locator import AssetLocator
+from openedx.core.djangoapps.header_control import force_header_for_response
from .caching import get_cached_content, set_cached_content
from xmodule.modulestore.exceptions import ItemNotFoundError
from xmodule.exceptions import NotFoundError
diff --git a/common/djangoapps/header_control/__init__.py b/openedx/core/djangoapps/header_control/__init__.py
similarity index 100%
rename from common/djangoapps/header_control/__init__.py
rename to openedx/core/djangoapps/header_control/__init__.py
diff --git a/common/djangoapps/header_control/decorators.py b/openedx/core/djangoapps/header_control/decorators.py
similarity index 94%
rename from common/djangoapps/header_control/decorators.py
rename to openedx/core/djangoapps/header_control/decorators.py
index cb0d148ad68..34f37951e58 100644
--- a/common/djangoapps/header_control/decorators.py
+++ b/openedx/core/djangoapps/header_control/decorators.py
@@ -3,7 +3,7 @@ Middleware decorator for removing headers.
"""
from functools import wraps
-from header_control import remove_headers_from_response, force_header_for_response
+from openedx.core.djangoapps.header_control import remove_headers_from_response, force_header_for_response
def remove_headers(*headers):
diff --git a/common/djangoapps/header_control/middleware.py b/openedx/core/djangoapps/header_control/middleware.py
similarity index 100%
rename from common/djangoapps/header_control/middleware.py
rename to openedx/core/djangoapps/header_control/middleware.py
diff --git a/common/djangoapps/header_control/tests/__init__.py b/openedx/core/djangoapps/header_control/tests/__init__.py
similarity index 100%
rename from common/djangoapps/header_control/tests/__init__.py
rename to openedx/core/djangoapps/header_control/tests/__init__.py
diff --git a/common/djangoapps/header_control/tests/test_decorators.py b/openedx/core/djangoapps/header_control/tests/test_decorators.py
similarity index 91%
rename from common/djangoapps/header_control/tests/test_decorators.py
rename to openedx/core/djangoapps/header_control/tests/test_decorators.py
index cf5c1afbb0a..926d8374507 100644
--- a/common/djangoapps/header_control/tests/test_decorators.py
+++ b/openedx/core/djangoapps/header_control/tests/test_decorators.py
@@ -1,7 +1,8 @@
"""Tests for remove_headers and force_header decorator. """
from django.http import HttpResponse, HttpRequest
from django.test import TestCase
-from header_control.decorators import remove_headers, force_header
+
+from openedx.core.djangoapps.header_control.decorators import remove_headers, force_header
def fake_view(_request):
diff --git a/common/djangoapps/header_control/tests/test_middleware.py b/openedx/core/djangoapps/header_control/tests/test_middleware.py
similarity index 93%
rename from common/djangoapps/header_control/tests/test_middleware.py
rename to openedx/core/djangoapps/header_control/tests/test_middleware.py
index 34e5e503c5f..8f96861f5cd 100644
--- a/common/djangoapps/header_control/tests/test_middleware.py
+++ b/openedx/core/djangoapps/header_control/tests/test_middleware.py
@@ -1,8 +1,9 @@
"""Tests for header_control middleware."""
from django.http import HttpResponse, HttpRequest
from django.test import TestCase
-from header_control import remove_headers_from_response, force_header_for_response
-from header_control.middleware import HeaderControlMiddleware
+
+from openedx.core.djangoapps.header_control import remove_headers_from_response, force_header_for_response
+from openedx.core.djangoapps.header_control.middleware import HeaderControlMiddleware
class TestHeaderControlMiddlewareProcessResponse(TestCase):
--
GitLab