diff options
| author | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2021-01-12 20:55:32 +0100 |
|---|---|---|
| committer | Mariusz Felisiak <felisiak.mariusz@gmail.com> | 2021-01-14 17:50:04 +0100 |
| commit | 4bb30fe5d598a7acd2a3055c5e66224cf42a75e9 (patch) | |
| tree | e46ebaa8e16debbcde2eeb70ca1a9db55e8f8f27 /django/middleware/cache.py | |
| parent | 6b4941dd577c494cfa49dbeacfd33594ae770047 (diff) | |
Refs #26601 -- Made get_response argument required and don't accept None in middleware classes.
Per deprecation timeline.
Diffstat (limited to 'django/middleware/cache.py')
| -rw-r--r-- | django/middleware/cache.py | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/django/middleware/cache.py b/django/middleware/cache.py index 97bb199eff..85de0e91c5 100644 --- a/django/middleware/cache.py +++ b/django/middleware/cache.py @@ -61,9 +61,7 @@ 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): + def __init__(self, get_response): super().__init__(get_response) self.cache_timeout = settings.CACHE_MIDDLEWARE_SECONDS self.page_timeout = None @@ -124,9 +122,7 @@ 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): + def __init__(self, get_response): super().__init__(get_response) self.key_prefix = settings.CACHE_MIDDLEWARE_KEY_PREFIX self.cache_alias = settings.CACHE_MIDDLEWARE_ALIAS @@ -168,9 +164,7 @@ 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): + def __init__(self, get_response, cache_timeout=None, page_timeout=None, **kwargs): super().__init__(get_response) # We need to differentiate between "provided, but using default value", # and "not provided". If the value is provided using a default, then |
