Skip to content

Commit

Permalink
Removed middleware setters.
Browse files Browse the repository at this point in the history
I don't know if I can change other tests to make it work, but looks
the correct solution for me.
  • Loading branch information
iurisilvio committed Nov 1, 2021
1 parent 7f0591a commit 2767657
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 19 deletions.
19 changes: 2 additions & 17 deletions django/middleware/cache.py
Expand Up @@ -70,14 +70,7 @@ def __init__(self, get_response):

@property
def cache(self):
try:
return self._cache
except AttributeError:
return caches[self.cache_alias]

@cache.setter
def cache(self, value):
self._cache = value
return caches[self.cache_alias]

def _should_update_cache(self, request, response):
return hasattr(request, '_cache_update_cache') and request._cache_update_cache
Expand Down Expand Up @@ -139,14 +132,7 @@ def __init__(self, get_response):

@property
def cache(self):
try:
return self._cache
except AttributeError:
return caches[self.cache_alias]

@cache.setter
def cache(self, value):
self._cache = value
return caches[self.cache_alias]

def process_request(self, request):
"""
Expand Down Expand Up @@ -198,7 +184,6 @@ def __init__(self, get_response, cache_timeout=None, page_timeout=None, **kwargs
self.key_prefix = key_prefix
except KeyError:
pass

try:
cache_alias = kwargs['cache_alias']
if cache_alias is None:
Expand Down
2 changes: 0 additions & 2 deletions tests/cache/tests.py
Expand Up @@ -996,7 +996,6 @@ def test_custom_key_func(self):

def test_cache_write_unpicklable_object(self):
fetch_middleware = FetchFromCacheMiddleware(empty_response)
fetch_middleware.cache = cache

request = self.factory.get('/cache/test')
request._cache_update_cache = True
Expand All @@ -1011,7 +1010,6 @@ def get_response(req):
return response

update_middleware = UpdateCacheMiddleware(get_response)
update_middleware.cache = cache
response = update_middleware(request)

get_cache_data = fetch_middleware.process_request(request)
Expand Down

0 comments on commit 2767657

Please sign in to comment.