Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #7967 -- Make sure the __contains__ method in the cache backend…

…s call the

right has_key() method for the subclass. Patch from Marty Alchin.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@8084 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit 6f16b5bad2f714b88639ebb90d30fd6cef686cfc 1 parent f49c5c2
@malcolmt malcolmt authored
View
9 django/core/cache/backends/base.py
@@ -63,4 +63,11 @@ def has_key(self, key):
"""
return self.get(key) is not None
- __contains__ = has_key
+ def __contains__(self, key):
+ """
+ Returns True if the key is in the cache and has not expired.
+ """
+ # This is a separate method, rather than just a copy of has_key(),
+ # so that it always has the same functionality as has_key(), even
+ # if a subclass overrides it.
+ return self.has_key(key)
View
4 tests/regressiontests/cache/tests.py
@@ -56,11 +56,15 @@ def test_has_key(self):
cache.set("hello1", "goodbye1")
self.assertEqual(cache.has_key("hello1"), True)
self.assertEqual(cache.has_key("goodbye1"), False)
+ cache.set("empty", 'fred')
+ self.assertEqual(cache.has_key("empty"), True)
def test_in(self):
cache.set("hello2", "goodbye2")
self.assertEqual("hello2" in cache, True)
self.assertEqual("goodbye2" in cache, False)
+ cache.set("empty", 'fred')
+ self.assertEqual("empty" in cache, True)
def test_data_types(self):
stuff = {
Please sign in to comment.
Something went wrong with that request. Please try again.