From ac6ec4e7642346ac7903270be43828814e20b2e7 Mon Sep 17 00:00:00 2001 From: vangheem Date: Thu, 15 Nov 2018 08:52:47 -0500 Subject: [PATCH] just use `__self__` Co-authored-by: Wildcard Corp. --- news/43.bugfix | 2 +- src/Products/PlonePAS/plugins/local_role.py | 9 +++------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/news/43.bugfix b/news/43.bugfix index a00f554a..1b7b23ef 100644 --- a/news/43.bugfix +++ b/news/43.bugfix @@ -1,2 +1,2 @@ -Check for both `__self__` and `im_self` for Python 3 compatibility +Change `im_self` to `__self__` [vangheem] \ No newline at end of file diff --git a/src/Products/PlonePAS/plugins/local_role.py b/src/Products/PlonePAS/plugins/local_role.py index 68822fb8..5397b30d 100644 --- a/src/Products/PlonePAS/plugins/local_role.py +++ b/src/Products/PlonePAS/plugins/local_role.py @@ -78,8 +78,7 @@ def getRolesInContext(self, user, object): object = parent continue - new = (getattr(object, 'im_self', None) or - getattr(object, '__self__', None)) + new = getattr(object, '__self__', None) if new is not None: object = aq_inner(new) @@ -135,8 +134,7 @@ def checkLocalRolesAllowed(self, user, object, object_roles): inner_obj = parent continue - new = (getattr(inner_obj, 'im_self', None) or - getattr(inner_obj, '__self__', None)) + new = getattr(inner_obj, '__self__', None) if new is not None: inner_obj = aq_inner(new) @@ -177,8 +175,7 @@ def getAllLocalRolesInContext(self, context): object = parent continue - new = (getattr(object, 'im_self', None) or - getattr(object, '__self__', None)) + new = getattr(object, '__self__', None) if new is not None: object = aq_inner(new)