X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=sfa%2Fstorage%2Fparameter.py;fp=sfa%2Fstorage%2Fparameter.py;h=2d6d0681d6e191034a2d95b0ce9204fe14151c4a;hp=bd9d3b543cdb6303a33ee80e7ab9639e825aad42;hb=130e896408741add08ebc3a1b6c74aca11023c1e;hpb=cea205b4982edebf6efe03f4b4dfda706b7592fa 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