From 130e896408741add08ebc3a1b6c74aca11023c1e Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 9 Apr 2019 22:05:29 +0200 Subject: [PATCH] remove old/python2 references to types like IntType and the like --- sfa/storage/parameter.py | 12 ++++++------ sfa/util/method.py | 3 +-- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/sfa/storage/parameter.py b/sfa/storage/parameter.py index bd9d3b54..2d6d0681 100644 --- a/sfa/storage/parameter.py +++ b/sfa/storage/parameter.py @@ -5,7 +5,7 @@ # Copyright (C) 2006 The Trustees of Princeton University # -from types import NoneType, IntType, LongType, FloatType, DictType, TupleType, ListType +#from types import NoneType, IntType, LongType, FloatType, DictType, TupleType, ListType from sfa.util.faults import SfaAPIError @@ -86,17 +86,17 @@ def xmlrpc_type(arg): if arg_type == NoneType: return "nil" - elif arg_type == IntType or arg_type == LongType: + elif arg_type == int: return "int" elif arg_type == bool: return "boolean" - elif arg_type == FloatType: + elif arg_type == float: return "double" - elif issubclass(arg_type, str): + elif arg_type == str: return "string" - elif arg_type == ListType or arg_type == TupleType: + elif arg_type in (list, tuple): return "array" - elif arg_type == DictType: + elif arg_type == dict: return "struct" elif arg_type == Mixed: # Not really an XML-RPC type but return "mixed" for diff --git a/sfa/util/method.py b/sfa/util/method.py index b3d7d1a7..7329036e 100644 --- a/sfa/util/method.py +++ b/sfa/util/method.py @@ -4,7 +4,6 @@ # import time -from types import IntType, LongType import textwrap from sfa.util.sfalogging import logger @@ -243,7 +242,7 @@ class Method: # Integers and long integers are also special types. Accept # either int or long types if an int or long is expected. - elif expected_type in (IntType, LongType) and isinstance(value, (IntType, LongType)): + elif expected_type is int and isinstance(value, int): pass elif not isinstance(value, expected_type): -- 2.43.0