p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[1.10.x] Fixed #27154 -- Allowed comparing CallableBool with bitwise or. 

Thanks Tim for the review.

Backport of b7fb608142 from master
This commit is contained in:
Olexander Yermakov 2016-08-31 11:07:30 +03:00 committed by Tim Graham
parent c6c1d940c1
commit 7c57f5cf8c
3 changed files with 15 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

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

2
docs/releases/1.10.1.txt
View File

@ -13,7 +13,7 @@ Bugfixes
doesn't return a result (:ticket:`26991`). doesn't return a result (:ticket:`26991`).
* Allowed ``User.is_authenticated`` and ``User.is_anonymous`` properties to be * Allowed ``User.is_authenticated`` and ``User.is_anonymous`` properties to be
compared using ``==`` and ``!=`` (:ticket:`26988`). compared using ``==``, ``!=``, and ``|`` (:ticket:`26988`, :ticket:`27154`).
* Removed the broken ``BaseCommand.usage()`` method which was for * Removed the broken ``BaseCommand.usage()`` method which was for
``optparse`` support (:ticket:`27000`). ``optparse`` support (:ticket:`27000`).

11
tests/utils_tests/test_deprecation.py
View File

@ -14,3 +14,14 @@ class TestCallableBool(SimpleTestCase):
self.assertEqual(CallableFalse, False) self.assertEqual(CallableFalse, False)
self.assertFalse(CallableFalse != False) # noqa: E712 self.assertFalse(CallableFalse != False) # noqa: E712
self.assertNotEqual(CallableFalse, True) self.assertNotEqual(CallableFalse, True)
def test_or(self):
self.assertIs(CallableTrue | CallableTrue, True)
self.assertIs(CallableTrue | CallableFalse, True)
self.assertIs(CallableFalse | CallableTrue, True)
self.assertIs(CallableFalse | CallableFalse, False)
self.assertIs(CallableTrue | True, True)
self.assertIs(CallableTrue | False, True)
self.assertIs(CallableFalse | True, True)
self.assertFalse(CallableFalse | False, False)