git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
do not depend on types.StringTypes anymore
[sfa.git]
/
sfa
/
storage
/
parameter.py
diff --git
a/sfa/storage/parameter.py
b/sfa/storage/parameter.py
index
e520bfc
..
dc9d5b5
100644
(file)
--- a/
sfa/storage/parameter.py
+++ b/
sfa/storage/parameter.py
@@
-5,9
+5,11
@@
# Copyright (C) 2006 The Trustees of Princeton University
#
# Copyright (C) 2006 The Trustees of Princeton University
#
-from types import NoneType, IntType, LongType, FloatType,
StringTypes,
DictType, TupleType, ListType
+from types import NoneType, IntType, LongType, FloatType, DictType, TupleType, ListType
from sfa.util.faults import SfaAPIError
from sfa.util.faults import SfaAPIError
+from sfa.util.py23 import StringType
+
class Parameter:
"""
Typed value wrapper. Use in accepts and returns to document method
class Parameter:
"""
Typed value wrapper. Use in accepts and returns to document method
@@
-89,7
+91,7
@@
def xmlrpc_type(arg):
return "boolean"
elif arg_type == FloatType:
return "double"
return "boolean"
elif arg_type == FloatType:
return "double"
- elif
arg_type in StringTypes
:
+ elif
issubclass(arg_type, StringType)
:
return "string"
elif arg_type == ListType or arg_type == TupleType:
return "array"
return "string"
elif arg_type == ListType or arg_type == TupleType:
return "array"
@@
-100,4
+102,4
@@
def xmlrpc_type(arg):
# documentation purposes.
return "mixed"
else:
# documentation purposes.
return "mixed"
else:
- raise SfaAPIError
, "XML-RPC cannot marshal %s objects" % arg_type
+ raise SfaAPIError
("XML-RPC cannot marshal %s objects" % arg_type)