From 18620f10811908d623110fd1d9a69e067a313742 Mon Sep 17 00:00:00 2001 From: Nick Schwane Date: Wed, 18 Oct 2023 10:56:24 -0400 Subject: [PATCH 1/2] fix: fix integer priority sorting --- casbin/model/model.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/casbin/model/model.py b/casbin/model/model.py index e33fd71..369f7a8 100644 --- a/casbin/model/model.py +++ b/casbin/model/model.py @@ -124,7 +124,11 @@ def sort_policies_by_priority(self): if assertion.priority_index == -1: continue - assertion.policy = sorted(assertion.policy, key=lambda x: x[assertion.priority_index]) + assertion.policy = sorted( + assertion.policy, + key=lambda x: int(x[assertion.priority_index]) if x[assertion.priority_index].isdigit() else + x[assertion.priority_index] + ) for i, policy in enumerate(assertion.policy): assertion.policy_map[",".join(policy)] = i From 33a06fb6d35f868a0cb8a4ff420f32b166528ef8 Mon Sep 17 00:00:00 2001 From: Nick Schwane Date: Wed, 18 Oct 2023 11:20:48 -0400 Subject: [PATCH 2/2] fix: fix formatting with black --- casbin/model/model.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/casbin/model/model.py b/casbin/model/model.py index 369f7a8..ecef775 100644 --- a/casbin/model/model.py +++ b/casbin/model/model.py @@ -126,8 +126,9 @@ def sort_policies_by_priority(self): assertion.policy = sorted( assertion.policy, - key=lambda x: int(x[assertion.priority_index]) if x[assertion.priority_index].isdigit() else - x[assertion.priority_index] + key=lambda x: int(x[assertion.priority_index]) + if x[assertion.priority_index].isdigit() + else x[assertion.priority_index], ) for i, policy in enumerate(assertion.policy):