Merge pull request #380 from jedfrechette/master

Improve compatibility with Python 3.10 and newer

pyblish_qml/host.py

@@ -9,6 +9,12 @@
 
 from . import ipc, settings, _state
 from .vendor.six.moves import queue
+from .vendor import six
+
+if six.PY2:
+    get_arg_spec = inspect.getargspec
+else:
+    get_arg_spec = inspect.getfullargspec
 
 MODULE_DIR = os.path.dirname(__file__)
 SPLASH_PATH = os.path.join(MODULE_DIR, "splash.png")
@@ -24,7 +30,7 @@ def register_dispatch_wrapper(wrapper):
 
     """
 
-    signature = inspect.getargspec(wrapper)
+    signature = get_arg_spec(wrapper)
     if any([len(signature.args) != 1,
             signature.varargs is None,
             signature.keywords is None]):

pyblish_qml/ipc/formatting.py

@@ -5,12 +5,18 @@
 import traceback
 
 from . import schema
+from ..vendor import six
 
 import pyblish.lib
 import pyblish.plugin
 
 log = logging.getLogger("pyblish")
 
+if six.PY2:
+    get_arg_spec = inspect.getargspec
+else:
+    get_arg_spec = inspect.getfullargspec
+
 
 def extract_traceback(exception):
     try:
@@ -253,7 +259,7 @@ def format_plugin(plugin):
 
     has_repair = False
 
-    args = inspect.getargspec(plugin.repair).args
+    args = get_arg_spec(plugin.repair).args
     if "context" in args or "instance" in args:
         has_repair = True
 
@@ -293,10 +299,10 @@ def format_plugin(plugin):
         "module": module,
         "hasRepair": has_repair,
         "process": {
-            "args": inspect.getargspec(plugin.process).args,
+            "args":  get_arg_spec(plugin.process).args,
         },
         "repair": {
-            "args": inspect.getargspec(plugin.repair).args,
+            "args":  get_arg_spec(plugin.repair).args,
         },
 
         "actions": [format_action(a) for a in plugin.actions],

pyblish_qml/vendor/mock.py

@@ -43,6 +43,12 @@
     # may not have inspect
     inspect = None
 
+from . import six
+if six.PY2:
+    get_arg_spec = inspect.getargspec
+else:
+    get_arg_spec = inspect.getfullargspec
+
 try:
     from functools import wraps as original_wraps
 except ImportError:
@@ -174,7 +180,7 @@ def _getsignature(func, skipfirst, instance=False):
         regargs, varargs, varkw, defaults, kwonly, kwonlydef, ann = argspec
     else:
         try:
-            regargs, varargs, varkwargs, defaults = inspect.getargspec(func)
+            regargs, varargs, varkwargs, defaults = get_arg_spec(func)
         except TypeError:
             # C function / method, possibly inherited object().__init__
             return