Andal.LND/edx-platform
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BOM-1121

Browse Source 
-Updated middleware setting to use use middleware insted of
middleware_classes
-github install of django-method-override fork to support
new style middleware in django1.11
This commit is contained in:
Ayub-khan
2020-02-11 12:45:54 +05:00
parent a9bd66b480
commit d3a02bc3e5
16 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cms/envs/common.py
View File

@@ -566,7 +566,7 @@ XQUEUE_INTERFACE = {
################################# Middleware ###################################
MIDDLEWARE_CLASSES = [
MIDDLEWARE = [
'openedx.core.lib.x_forwarded_for.middleware.XForwardedForMiddleware',
'crum.CurrentRequestUserMiddleware',

2
cms/envs/devstack.py
View File

@@ -72,7 +72,7 @@ CELERY_ALWAYS_EAGER = True
INSTALLED_APPS += ['debug_toolbar']
MIDDLEWARE_CLASSES.append('debug_toolbar.middleware.DebugToolbarMiddleware')
MIDDLEWARE.append('debug_toolbar.middleware.DebugToolbarMiddleware')
INTERNAL_IPS = ('127.0.0.1',)
DEBUG_TOOLBAR_PANELS = (

2
cms/envs/production.py
View File

@@ -589,7 +589,7 @@ PARENTAL_CONSENT_AGE_LIMIT = ENV_TOKENS.get(
########################## Extra middleware classes #######################
# Allow extra middleware classes to be added to the app through configuration.
MIDDLEWARE_CLASSES.extend(ENV_TOKENS.get('EXTRA_MIDDLEWARE_CLASSES', []))
MIDDLEWARE.extend(ENV_TOKENS.get('EXTRA_MIDDLEWARE_CLASSES', []))
########################## Settings for Completion API #####################

2
common/djangoapps/third_party_auth/settings.py
View File

@@ -23,7 +23,7 @@ def apply_settings(django_settings):
django_settings.FIELDS_STORED_IN_SESSION = ['auth_entry', 'next']
# Inject exception middleware to make redirects fire.
django_settings.MIDDLEWARE_CLASSES.extend(
django_settings.MIDDLEWARE.extend(
['third_party_auth.middleware.ExceptionMiddleware']
)

4
common/djangoapps/third_party_auth/tests/test_settings.py
View File

@@ -14,7 +14,7 @@ _ORIGINAL_TEMPLATE_CONTEXT_PROCESSORS = ['first_template_context_preprocessor']
_SETTINGS_MAP = {
'AUTHENTICATION_BACKENDS': _ORIGINAL_AUTHENTICATION_BACKENDS,
'INSTALLED_APPS': _ORIGINAL_INSTALLED_APPS,
'MIDDLEWARE_CLASSES': _ORIGINAL_MIDDLEWARE_CLASSES,
'MIDDLEWARE': _ORIGINAL_MIDDLEWARE_CLASSES,
'TEMPLATES': [{
'OPTIONS': {
'context_processors': _ORIGINAL_TEMPLATE_CONTEXT_PROCESSORS
@@ -37,7 +37,7 @@ class SettingsUnitTest(testutil.TestCase):
def test_apply_settings_adds_exception_middleware(self):
settings.apply_settings(self.settings)
self.assertIn('third_party_auth.middleware.ExceptionMiddleware', self.settings.MIDDLEWARE_CLASSES)
self.assertIn('third_party_auth.middleware.ExceptionMiddleware', self.settings.MIDDLEWARE)
def test_apply_settings_adds_fields_stored_in_session(self):
settings.apply_settings(self.settings)

2
lms/envs/common.py
View File

@@ -1433,7 +1433,7 @@ CREDIT_NOTIFICATION_CACHE_TIMEOUT = 5 * 60 * 60
################################# Middleware ###################################
MIDDLEWARE_CLASSES = [
MIDDLEWARE = [
'openedx.core.lib.x_forwarded_for.middleware.XForwardedForMiddleware',
'crum.CurrentRequestUserMiddleware',

2
lms/envs/devstack.py
View File

@@ -67,7 +67,7 @@ DJFS = {
################################ DEBUG TOOLBAR ################################
INSTALLED_APPS += ['debug_toolbar']
MIDDLEWARE_CLASSES += [
MIDDLEWARE += [
'lms.djangoapps.discussion.django_comment_client.utils.QueryCountDebugMiddleware',
'debug_toolbar.middleware.DebugToolbarMiddleware',
]

2
lms/envs/load_test.py
View File

@@ -19,4 +19,4 @@ EXCLUDE_CSRF = lambda elem: elem not in [
DEFAULT_TEMPLATE_ENGINE['OPTIONS']['context_processors'] = list(filter(
EXCLUDE_CSRF, DEFAULT_TEMPLATE_ENGINE['OPTIONS']['context_processors']
))
MIDDLEWARE_CLASSES = list(filter(EXCLUDE_CSRF, MIDDLEWARE_CLASSES))
MIDDLEWARE = list(filter(EXCLUDE_CSRF, MIDDLEWARE))

2
lms/envs/production.py
View File

@@ -1098,7 +1098,7 @@ PARENTAL_CONSENT_AGE_LIMIT = ENV_TOKENS.get(
########################## Extra middleware classes #######################
# Allow extra middleware classes to be added to the app through configuration.
MIDDLEWARE_CLASSES.extend(ENV_TOKENS.get('EXTRA_MIDDLEWARE_CLASSES', []))
MIDDLEWARE.extend(ENV_TOKENS.get('EXTRA_MIDDLEWARE_CLASSES', []))
########################## Settings for Completion API #####################

2
openedx/core/djangoapps/safe_sessions/testing.py
View File

@@ -20,7 +20,7 @@ def safe_cookie_test_session_patch():
used, by checking the middleware settings.
"""
return (
'openedx.core.djangoapps.safe_sessions.middleware.SafeSessionMiddleware' in settings.MIDDLEWARE_CLASSES
'openedx.core.djangoapps.safe_sessions.middleware.SafeSessionMiddleware' in settings.MIDDLEWARE
)
## session_id --> safe_cookie_data ##

3
requirements/constraints.txt
View File

@@ -17,9 +17,6 @@ django-debug-toolbar<2.0
# Version 1.2.0 dropped support for Django 1.11
django-oauth-toolkit<1.2.0
# Version 1.0.0 dropped support for Django 1.11 simultaneously with adding support for 2.x
django-method-override<1.0.0
# Version 4.0.0 dropped support for Django < 2.0.1
django-model-utils<4.0.0

1
requirements/edx/base.in
View File

@@ -45,7 +45,6 @@ django-crum # Middleware that stores the current request
django-fernet-fields # via edx-enterprise (should be added to its setup.py)
django-filter # Allows users to filter Django querysets dynamically
django-ipware # Get the client's real IP address
django-method-override
django-model-utils
django-mptt
django-mysql

2
requirements/edx/base.txt
View File

@@ -65,7 +65,7 @@ django-fernet-fields==0.6
django-filter==2.2.0
django-ipware==2.1.0
django-js-asset==1.2.2 # via django-mptt
django-method-override==0.2.0
git+https://gitlab.com/Ayub-khan/django-method-override.git@5270af321be2e576d8e8b3c4191711a19975c356#egg=django-method-override==1.0.4
django-model-utils==3.0.0
django-mptt==0.11.0
django-multi-email-field==0.6.1 # via edx-enterprise

2
requirements/edx/development.txt
View File

@@ -76,7 +76,7 @@ django-fernet-fields==0.6
django-filter==2.2.0
django-ipware==2.1.0
django-js-asset==1.2.2
django-method-override==0.2.0
git+https://gitlab.com/Ayub-khan/django-method-override.git@5270af321be2e576d8e8b3c4191711a19975c356#egg=django-method-override==1.0.4
django-model-utils==3.0.0
django-mptt==0.11.0
django-multi-email-field==0.6.1

4
requirements/edx/github.in
View File

@@ -87,6 +87,10 @@ git+https://github.com/jazzband/sorl-thumbnail.git@13bedfb7d2970809eda597e3ef793
# remove this fork
git+https://github.com/edx/bridgekeeper.git@2423e8d8788c2132ebeec509e1a7b17e1f5b9364#egg=bridgekeeper==0.0
# Forked to get Django 1.11 new style middleware support from django-method-override.
# This can be removed once edx-platform is using django>=2.x.
git+https://gitlab.com/Ayub-khan/django-method-override.git@5270af321be2e576d8e8b3c4191711a19975c356#egg=django-method-override==1.0.4
# Our libraries:
-e git+https://github.com/edx/codejail.git@4127fc4bd5775cc72aee8d7f0a70e31405e22439#egg=codejail
-e git+https://github.com/edx/acid-block.git@98aecba94ecbfa934e2d00262741c0ea9f557fc9#egg=acid-xblock

2
requirements/edx/testing.txt
View File

@@ -74,7 +74,7 @@ django-fernet-fields==0.6
django-filter==2.2.0
django-ipware==2.1.0
django-js-asset==1.2.2
django-method-override==0.2.0
git+https://gitlab.com/Ayub-khan/django-method-override.git@5270af321be2e576d8e8b3c4191711a19975c356#egg=django-method-override==1.0.4
django-model-utils==3.0.0
django-mptt==0.11.0
django-multi-email-field==0.6.1