Merge d79e348 into f86951a

setup.py

@@ -77,6 +77,7 @@
           'zope.schema',
           'zope.security',
           'zope.testing',
+          'funcsigs;python_version<"3.3"',
       ],
       include_package_data=True,
       zip_safe=False,

src/AccessControl/requestmethod.py

@@ -11,31 +11,36 @@
 #
 ##############################################################################
 
-import inspect
-
+import six
 from zExceptions import Forbidden
 from zope.publisher.interfaces.browser import IBrowserRequest
 
-try:
+if six.PY3:
     from inspect import getfullargspec
-except ImportError:  # Python 2
+    from inspect import signature
+else:  # Python 2
     from inspect import getargspec as getfullargspec
-
+    from funcsigs import signature
 
 _default = []
 
 
-def _buildFacade(name, spec, docstring):
+def _buildFacade(name, method, docstring):
     """Build a facade function, matching the decorated method in signature.
 
     Note that defaults are replaced by _default, and _curried will reconstruct
     these to preserve mutable defaults.
 
     """
-    args = inspect.formatargspec(formatvalue=lambda v: '=_default', *spec)
-    callargs = inspect.formatargspec(formatvalue=lambda v: '', *spec)
-    return 'def %s%s:\n    """%s"""\n    return _curried%s' % (
-        name, args, docstring, callargs)
+    sig = signature(method)
+    args = []
+    for v in sig.parameters.values():
+        argstr = str(v)
+        args.append(
+            argstr if '=' not in argstr else '{}=_default'.format(v.name))
+    callargs = ', '.join(sig.parameters.keys())
+    return 'def %s(%s):\n    """%s"""\n    return _curried(%s)' % (
+        name, ', '.join(args), docstring, callargs)
 
 
 def requestmethod(*methods):
@@ -81,7 +86,8 @@ def _curried(*args, **kw):
         # Build a facade, with a reference to our locally-scoped _curried
         name = callable.__name__
         facade_globs = dict(_curried=_curried, _default=_default)
-        exec(_buildFacade(name, spec, callable.__doc__), facade_globs)
+        # exec(_buildFacade(name, spec, callable.__doc__), facade_globs)
+        exec(_buildFacade(name, callable, callable.__doc__), facade_globs)
         return facade_globs[name]
 
     return _methodtest

src/AccessControl/safe_formatter.py

@@ -1,5 +1,4 @@
 from AccessControl.ZopeGuards import guarded_getattr, guarded_getitem
-from collections import Mapping
 
 import string
 import six
@@ -10,6 +9,11 @@
 except ImportError:
     pass
 
+if six.PY3:
+    from collections.abc import Mapping
+else:
+    from collections import Mapping
+
 
 def formatter_field_name_split(field_name):
     if six.PY3: