diff options
| author | Claude Paroz <claude@2xlibre.net> | 2019-09-26 19:06:35 +0200 |
|---|---|---|
| committer | Carlton Gibson <carlton@noumenal.es> | 2020-02-18 20:03:44 +0100 |
| commit | 4d973f593932285cd2f765400d915305d8e7333a (patch) | |
| tree | 1cc48fd9e979d77906e522ecad2689d156d1377f /django/middleware | |
| parent | a34cb5a6d408203f4fbdb364fc9768c026eda224 (diff) | |
Refs #26601 -- Deprecated passing None as get_response arg to middleware classes.
This is the new contract since middleware refactoring in Django 1.10.
Co-authored-by: Carlton Gibson <carlton.gibson@noumenal.es>
Co-authored-by: Mariusz Felisiak <felisiak.mariusz@gmail.com>
Diffstat (limited to 'django/middleware')
| -rw-r--r-- | django/middleware/cache.py | 9 | ||||
| -rw-r--r-- | django/middleware/security.py | 3 |
2 files changed, 12 insertions, 0 deletions
diff --git a/django/middleware/cache.py b/django/middleware/cache.py index 9705270b59..e92f768fa3 100644 --- a/django/middleware/cache.py +++ b/django/middleware/cache.py @@ -61,7 +61,10 @@ class UpdateCacheMiddleware(MiddlewareMixin): UpdateCacheMiddleware must be the first piece of middleware in MIDDLEWARE so that it'll get called last during the response phase. """ + # RemovedInDjango40Warning: when the deprecation ends, replace with: + # def __init__(self, get_response): def __init__(self, get_response=None): + self._get_response_none_deprecation(get_response) self.cache_timeout = settings.CACHE_MIDDLEWARE_SECONDS self.page_timeout = None self.key_prefix = settings.CACHE_MIDDLEWARE_KEY_PREFIX @@ -122,7 +125,10 @@ class FetchFromCacheMiddleware(MiddlewareMixin): FetchFromCacheMiddleware must be the last piece of middleware in MIDDLEWARE so that it'll get called last during the request phase. """ + # RemovedInDjango40Warning: when the deprecation ends, replace with: + # def __init__(self, get_response): def __init__(self, get_response=None): + self._get_response_none_deprecation(get_response) self.key_prefix = settings.CACHE_MIDDLEWARE_KEY_PREFIX self.cache_alias = settings.CACHE_MIDDLEWARE_ALIAS self.cache = caches[self.cache_alias] @@ -164,7 +170,10 @@ class CacheMiddleware(UpdateCacheMiddleware, FetchFromCacheMiddleware): Also used as the hook point for the cache decorator, which is generated using the decorator-from-middleware utility. """ + # RemovedInDjango40Warning: when the deprecation ends, replace with: + # def __init__(self, get_response, cache_timeout=None, page_timeout=None, **kwargs): def __init__(self, get_response=None, cache_timeout=None, page_timeout=None, **kwargs): + self._get_response_none_deprecation(get_response) self.get_response = get_response # We need to differentiate between "provided, but using default value", # and "not provided". If the value is provided using a default, then diff --git a/django/middleware/security.py b/django/middleware/security.py index c0877b350a..035c329efb 100644 --- a/django/middleware/security.py +++ b/django/middleware/security.py @@ -6,7 +6,10 @@ from django.utils.deprecation import MiddlewareMixin class SecurityMiddleware(MiddlewareMixin): + # RemovedInDjango40Warning: when the deprecation ends, replace with: + # def __init__(self, get_response): def __init__(self, get_response=None): + self._get_response_none_deprecation(get_response) self.sts_seconds = settings.SECURE_HSTS_SECONDS self.sts_include_subdomains = settings.SECURE_HSTS_INCLUDE_SUBDOMAINS self.sts_preload = settings.SECURE_HSTS_PRELOAD |