Skip to content

Commit 025aaa9

Browse files
committed
Fix test for new object permission resolution
1 parent d88d06d commit 025aaa9

File tree

2 files changed

+5
-6
lines changed

2 files changed

+5
-6
lines changed

rest_framework/permissions.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -77,11 +77,10 @@ def has_permission(self, request, view):
7777
)
7878

7979
def has_object_permission(self, request, view, obj):
80-
return (
81-
(self.op1.has_permission(request, view) and self.op1.has_object_permission(request, view, obj))
82-
or
83-
(self.op2.has_permission(request, view) and self.op2.has_object_permission(request, view, obj))
84-
)
80+
op1 = self.op1.has_permission(request, view) and self.op1.has_object_permission(request, view, obj)
81+
if op1:
82+
return op1
83+
return self.op2.has_permission(request, view) and self.op2.has_object_permission(request, view, obj)
8584

8685

8786
class NOT:

tests/test_permissions.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -652,7 +652,7 @@ def test_object_or_lazyness(self):
652652
composed_perm = (permissions.IsAuthenticated | permissions.AllowAny)
653653
hasperm = composed_perm().has_object_permission(request, None, None)
654654
assert hasperm is True
655-
assert mock_deny.call_count == 1
655+
assert mock_deny.call_count == 0
656656
assert mock_allow.call_count == 1
657657

658658
def test_and_lazyness(self):

0 commit comments

Comments
 (0)