innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

[1.10.x] Fixed #27309 -- Added CallableBool.__hash__(). 

Backport of 3ab55c1a8a from master
This commit is contained in:
Reto Aebersold 2016-10-04 05:44:19 -06:00 committed by Tim Graham
parent 67fd51a54f
commit c473235bf6
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
django/utils/deprecation.py
View File

@ -116,6 +116,9 @@ class CallableBool:
def __or__(self, other): def __or__(self, other):
return bool(self.value or other) return bool(self.value or other)
def __hash__(self):
return hash(self.value)
CallableFalse = CallableBool(False) CallableFalse = CallableBool(False)
CallableTrue = CallableBool(True) CallableTrue = CallableBool(True)

3
docs/releases/1.10.3.txt
View File

@ -9,4 +9,5 @@ Django 1.10.3 fixes several bugs in 1.10.2.
Bugfixes Bugfixes
======== ========
* ... * Allowed ``User.is_authenticated`` and ``User.is_anonymous`` properties to be
tested for ``set`` membership (:ticket:`27309`).

4
tests/utils_tests/test_deprecation.py
View File

@ -25,3 +25,7 @@ class TestCallableBool(SimpleTestCase):
self.assertIs(CallableTrue | False, True) self.assertIs(CallableTrue | False, True)
self.assertIs(CallableFalse | True, True) self.assertIs(CallableFalse | True, True)
self.assertFalse(CallableFalse | False, False) self.assertFalse(CallableFalse | False, False)
def test_set_membership(self):
self.assertIs(CallableTrue in {True}, True)
self.assertIs(CallableFalse not in {True}, True)