Merge 61df2af into bdd49bc

dropbox · May 18, 2023 · 49fa860 · 49fa860
2 parents bdd49bc + 61df2af
commit 49fa860
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/stone/frontend/ir_generator.py b/stone/frontend/ir_generator.py
@@ -3,9 +3,14 @@
 from collections import defaultdict
 
 import copy
-import inspect
 import logging
 
+from inspect import isclass
+try:
+    from inspect import getfullargspec as get_args
+except ImportError:
+    from inspect import getargspec as get_args
+
 _MYPY = False
 if _MYPY:
     import typing  # noqa: F401 # pylint: disable=import-error,unused-import,useless-suppression
@@ -1074,7 +1079,7 @@ def _instantiate_data_type(self, data_type_class, data_type_args, loc):
         assert issubclass(data_type_class, DataType), \
             'Expected stone.data_type.DataType, got %r' % data_type_class
 
-        argspec = inspect.getargspec(data_type_class.__init__)  # noqa: E501 # pylint: disable=deprecated-method,useless-suppression
+        argspec = get_args(data_type_class.__init__)  # noqa: E501 # pylint: disable=deprecated-method,useless-suppression
         argspec.args.remove('self')
         num_args = len(argspec.args)
         # Unfortunately, argspec.defaults is None if there are no defaults
@@ -1154,7 +1159,7 @@ def _resolve_type(self, env, type_ref, enforce_fully_defined=False):
         if obj is Void and type_ref.nullable:
             raise InvalidSpec('Void cannot be marked nullable.',
                               *loc)
-        elif inspect.isclass(obj):
+        elif isclass(obj):
             resolved_data_type_args = self._resolve_args(env, type_ref.args)
             data_type = self._instantiate_data_type(
                 obj, resolved_data_type_args, (type_ref.lineno, type_ref.path))