Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Regression test and patch for ticket #20924.

  • Loading branch information...
commit b9ef96e73cf2f2613eb6ca96038ef8c4271ac116 1 parent bc5716f
@nickbruun nickbruun authored
View
8 django/utils/functional.py
@@ -270,6 +270,14 @@ def __setitem__(self, key, value):
def __delitem__(self, key):
del self[key]
+ @new_method_proxy
+ def __len__(self):
+ return len(self)
+
+ @new_method_proxy
+ def __contains__(self, key):
+ return key in self
+
# Workaround for http://bugs.python.org/issue12370
_super = super
View
13 tests/utils_tests/test_simplelazyobject.py
@@ -136,6 +136,9 @@ def test_dict(self):
self.assertEqual(lazydict['one'], 1)
lazydict['one'] = -1
self.assertEqual(lazydict['one'], -1)
+ self.assertTrue('one' in lazydict)
+ self.assertFalse('two' in lazydict)
+ self.assertEqual(len(lazydict), 1)
del lazydict['one']
with self.assertRaises(KeyError):
lazydict['one']
@@ -183,3 +186,13 @@ def test_pickle_py2_regression(self):
# This would fail with "TypeError: expected string or Unicode object, NoneType found".
pickled = cPickle.dumps(x)
+
+ def test_list_set(self):
+ lazy_list = SimpleLazyObject(lambda: [1, 2, 3, 4, 5])
+ lazy_set = SimpleLazyObject(lambda: set([1, 2, 3, 4]))
+ self.assertTrue(1 in lazy_list)
+ self.assertTrue(1 in lazy_set)
+ self.assertFalse(6 in lazy_list)
+ self.assertFalse(6 in lazy_set)
+ self.assertEqual(len(lazy_list), 5)
+ self.assertEqual(len(lazy_set), 4)
Please sign in to comment.
Something went wrong with that request. Please try again.