Skip to content

Commit e8b01dd

Browse files
committed
style: black
1 parent 4029583 commit e8b01dd

2 files changed

Lines changed: 43 additions & 26 deletions

File tree

tableauserverclient/models/permissions_item.py

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,10 @@ def __and__(self, other: "PermissionsRule") -> "PermissionsRule":
5959
capabilities = set((*self.capabilities.keys(), *other.capabilities.keys()))
6060
new_capabilities = {}
6161
for capability in capabilities:
62-
if (self.capabilities.get(capability), other.capabilities.get(capability)) == (Permission.Mode.Allow, Permission.Mode.Allow):
62+
if (self.capabilities.get(capability), other.capabilities.get(capability)) == (
63+
Permission.Mode.Allow,
64+
Permission.Mode.Allow,
65+
):
6366
new_capabilities[capability] = Permission.Mode.Allow
6467
elif Permission.Mode.Deny in (self.capabilities.get(capability), other.capabilities.get(capability)):
6568
new_capabilities[capability] = Permission.Mode.Deny
@@ -74,7 +77,10 @@ def __or__(self, other: "PermissionsRule") -> "PermissionsRule":
7477
for capability in capabilities:
7578
if Permission.Mode.Allow in (self.capabilities.get(capability), other.capabilities.get(capability)):
7679
new_capabilities[capability] = Permission.Mode.Allow
77-
elif (self.capabilities.get(capability), other.capabilities.get(capability)) == (Permission.Mode.Deny, Permission.Mode.Deny):
80+
elif (self.capabilities.get(capability), other.capabilities.get(capability)) == (
81+
Permission.Mode.Deny,
82+
Permission.Mode.Deny,
83+
):
7884
new_capabilities[capability] = Permission.Mode.Deny
7985

8086
return PermissionsRule(self.grantee, new_capabilities)

test/test_permissionsrule.py

Lines changed: 35 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,27 @@
33
import tableauserverclient as TSC
44
from tableauserverclient.models.reference_item import ResourceReference
55

6+
67
class TestPermissionsRules(unittest.TestCase):
78
def test_and(self):
89
grantee = ResourceReference("a", "user")
9-
rule1 = TSC.PermissionsRule(grantee, {
10-
TSC.Permission.Capability.ExportData: TSC.Permission.Mode.Allow,
11-
TSC.Permission.Capability.Delete: TSC.Permission.Mode.Deny,
12-
TSC.Permission.Capability.ViewComments: TSC.Permission.Mode.Allow,
13-
TSC.Permission.Capability.ExportXml: TSC.Permission.Mode.Deny,
14-
})
15-
rule2 = TSC.PermissionsRule(grantee, {
16-
TSC.Permission.Capability.ExportData: TSC.Permission.Mode.Allow,
17-
TSC.Permission.Capability.Delete: TSC.Permission.Mode.Allow,
18-
TSC.Permission.Capability.ExportXml: TSC.Permission.Mode.Deny,
19-
})
10+
rule1 = TSC.PermissionsRule(
11+
grantee,
12+
{
13+
TSC.Permission.Capability.ExportData: TSC.Permission.Mode.Allow,
14+
TSC.Permission.Capability.Delete: TSC.Permission.Mode.Deny,
15+
TSC.Permission.Capability.ViewComments: TSC.Permission.Mode.Allow,
16+
TSC.Permission.Capability.ExportXml: TSC.Permission.Mode.Deny,
17+
},
18+
)
19+
rule2 = TSC.PermissionsRule(
20+
grantee,
21+
{
22+
TSC.Permission.Capability.ExportData: TSC.Permission.Mode.Allow,
23+
TSC.Permission.Capability.Delete: TSC.Permission.Mode.Allow,
24+
TSC.Permission.Capability.ExportXml: TSC.Permission.Mode.Deny,
25+
},
26+
)
2027

2128
composite = rule1 & rule2
2229

@@ -25,25 +32,29 @@ def test_and(self):
2532
self.assertEqual(composite.capabilities.get(TSC.Permission.Capability.ViewComments), None)
2633
self.assertEqual(composite.capabilities.get(TSC.Permission.Capability.ExportXml), TSC.Permission.Mode.Deny)
2734

28-
2935
def test_or(self):
3036
grantee = ResourceReference("a", "user")
31-
rule1 = TSC.PermissionsRule(grantee, {
32-
TSC.Permission.Capability.ExportData: TSC.Permission.Mode.Allow,
33-
TSC.Permission.Capability.Delete: TSC.Permission.Mode.Deny,
34-
TSC.Permission.Capability.ViewComments: TSC.Permission.Mode.Allow,
35-
TSC.Permission.Capability.ExportXml: TSC.Permission.Mode.Deny,
36-
})
37-
rule2 = TSC.PermissionsRule(grantee, {
38-
TSC.Permission.Capability.ExportData: TSC.Permission.Mode.Allow,
39-
TSC.Permission.Capability.Delete: TSC.Permission.Mode.Allow,
40-
TSC.Permission.Capability.ExportXml: TSC.Permission.Mode.Deny,
41-
})
37+
rule1 = TSC.PermissionsRule(
38+
grantee,
39+
{
40+
TSC.Permission.Capability.ExportData: TSC.Permission.Mode.Allow,
41+
TSC.Permission.Capability.Delete: TSC.Permission.Mode.Deny,
42+
TSC.Permission.Capability.ViewComments: TSC.Permission.Mode.Allow,
43+
TSC.Permission.Capability.ExportXml: TSC.Permission.Mode.Deny,
44+
},
45+
)
46+
rule2 = TSC.PermissionsRule(
47+
grantee,
48+
{
49+
TSC.Permission.Capability.ExportData: TSC.Permission.Mode.Allow,
50+
TSC.Permission.Capability.Delete: TSC.Permission.Mode.Allow,
51+
TSC.Permission.Capability.ExportXml: TSC.Permission.Mode.Deny,
52+
},
53+
)
4254

4355
composite = rule1 | rule2
4456

4557
self.assertEqual(composite.capabilities.get(TSC.Permission.Capability.ExportData), TSC.Permission.Mode.Allow)
4658
self.assertEqual(composite.capabilities.get(TSC.Permission.Capability.Delete), TSC.Permission.Mode.Allow)
4759
self.assertEqual(composite.capabilities.get(TSC.Permission.Capability.ViewComments), TSC.Permission.Mode.Allow)
4860
self.assertEqual(composite.capabilities.get(TSC.Permission.Capability.ExportXml), TSC.Permission.Mode.Deny)
49-

0 commit comments

Comments
 (0)