just use __self__

Co-authored-by: Wildcard Corp. <corporate@wildcardcorp.com>
plone · Nov 15, 2018 · ac6ec4e · ac6ec4e
1 parent 7e56cfe
commit ac6ec4e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 7 deletions.
diff --git 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]
diff --git 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)