Merge pull request #94 from stephenfin/stop-using-argspec

Fix #81: Stop using 'inspect.getargspec()'

Author: RonnyPfannschmidt

pluggy/__init__.py

@@ -492,7 +492,7 @@ def varnames(func):
             return ()
 
     try:  # func MUST be a function or method here or we won't parse any args
-        spec = inspect.getargspec(func)
+        spec = _getargspec(func)
     except TypeError:
         return (), ()
 
@@ -662,6 +662,14 @@ def __init__(self, plugin, plugin_name, function, hook_impl_opts):
         self.__dict__.update(hook_impl_opts)
 
 
+if hasattr(inspect, 'getfullargspec'):
+    def _getargspec(func):
+        return inspect.getfullargspec(func)
+else:
+    def _getargspec(func):
+        return inspect.getargspec(func)
+
+
 if hasattr(inspect, 'signature'):
     def _formatdef(func):
         return "%s%s" % (

tox.ini

@@ -39,8 +39,6 @@ addopts=-rxsX
 norecursedirs=.tox ja .hg .env*
 filterwarnings =
   error
-  # inspect.getargspec() ignored, should be fixed in #81
-  ignore:inspect.getargspec().*deprecated
 
 [flake8]
 max-line-length=99