Merge pull request #91 from plone/90-modernize-inspect

Remove deprecation warnings
plone · Feb 15, 2020 · 0810e40 · 0810e40
2 parents efdba84 + 770e345
commit 0810e40
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/news/90.bugfix b/news/90.bugfix
@@ -0,0 +1 @@
+Remove deprecation warnings
diff --git a/plone/protect/utils.py b/plone/protect/utils.py
@@ -45,8 +45,15 @@ def __init__(self, *checkers):
         self.checkers = checkers
 
     def __call__(self, callable):
-        spec = inspect.getargspec(callable)
-        args, defaults = spec[0], spec[3]
+        try:
+            spec = inspect.getfullargspec(callable)
+        except AttributeError:
+            # Python 2.7 compatibility
+            spec = inspect.getargspec(callable)
+
+        args = spec.args
+        defaults = spec.defaults
+
         try:
             r_index = args.index("REQUEST")
         except ValueError: