Fix http://issues.roundup-tracker.org/issue2550952 make __call__

method of a class usable as a check function.

Author: rouilj

roundup/anypy/findargspec.py

@@ -0,0 +1,28 @@
+''' Wrapper for getargspec to support other callables and python 3 support
+
+In python 3 just uses getfullargspec which handles regular functions
+and classes with __call__ methods.
+'''
+
+try:
+    # Python 3+
+    from inspect import getfullargspec as getargspec
+    findargspec = getargspec
+except:
+    # Python 2.5-2.7 modified from https://bugs.python.org/issue20828
+    import inspect
+
+    def findargspec(fn):
+        if inspect.isfunction(fn) or inspect.ismethod(fn):
+            inspectable = fn
+        elif inspect.isclass(fn):
+            inspectable = fn.__init__
+        elif hasattr(fn, '__call__'):
+            inspectable = fn.__call__
+        else:
+            inspectable = fn
+
+        try:
+            return inspect.getargspec(inspectable)
+        except TypeError:
+            raise

roundup/security.py

@@ -47,7 +47,7 @@ class Permission:
 
     def __init__(self, name='', description='', klass=None,
             properties=None, check=None, props_only=None):
-        import inspect
+        from roundup.anypy import findargspec
         self.name = name
         self.description = description
         self.klass = klass
@@ -75,11 +75,11 @@ def __init__(self, name='', description='', klass=None,
         if check is None:
             self.check_version = 0
         else:
-            args=inspect.getargspec(check)
-            # FIXME change args[2] to args.keywords since python
-            # 2.6 made getargspec a named tuple once roundup 1.6 released.
+            args=findargspec.findargspec(check)
+            # args[2] is the keywords argument. Leave it as a subscript and
+            # do not use named tuple reference as names change in python 3.
             # If there is a **parameter defined in the function spec, the
-            #  value of the 3rd argument in the tuple is not None.
+            # value of the 3rd argument (2nd index) in the tuple is not None.
             if args[2] is None:
                 # function definition is function(db, userid, itemid)
                 self.check_version = 1

test/test_security.py

@@ -181,8 +181,20 @@ def check(db,userid,itemid, **other):
             prop = other['permission']
             return (itemid == '1')
 
+        # also create a check as a callable of a class
+        #   http://issues.roundup-tracker.org/issue2550952
+        class CheckClass(object):
+            def __call__(self, db,userid,itemid, **other):
+                prop = other['property']
+                prop = other['classname']
+                prop = other['permission']
+                return (itemid == '1')
+
         addRole(name='Role3')
-        addToRole('Role3', add(name="Test", klass="test", check=check))
+        # make sure check=CheckClass() and not check=CheckClass
+        # otherwise we get:
+        # inspectible <slot wrapper '__init__' of 'object' objects>
+        addToRole('Role3', add(name="Test", klass="test", check=CheckClass()))
         user3 = self.db.user.create(username='user3', roles='Role3')
 
         addRole(name='Role4')