[gnue] r7028 - trunk/gnue-common/src/rpc/drivers/xmlrpc/pw_xmlrpc

[reinhard]

Author: reinhard
Date: 2005-02-15 07:50:52 -0600 (Tue, 15 Feb 2005)
New Revision: 7028

Modified:
   trunk/gnue-common/src/rpc/drivers/xmlrpc/pw_xmlrpc/typeconv.py
Log:
Check boolean before int on rpc_to_python, too (same reason as in
python_to_rpc: booleans are a subclass of int).


Modified: trunk/gnue-common/src/rpc/drivers/xmlrpc/pw_xmlrpc/typeconv.py
===================================================================
--- trunk/gnue-common/src/rpc/drivers/xmlrpc/pw_xmlrpc/typeconv.py      
2005-02-15 10:50:39 UTC (rev 7027)
+++ trunk/gnue-common/src/rpc/drivers/xmlrpc/pw_xmlrpc/typeconv.py      
2005-02-15 13:50:52 UTC (rev 7028)
@@ -103,6 +103,14 @@
     else:
       return None
 
+  # Boolean (has to be checked before IntType)
+  elif hasattr (types, 'BooleanType') and \
+       isinstance (value, xmlrpclib.boolean):
+    if value:
+      return True
+    else:
+      return False
+
   # Number
   elif isinstance (value, types.IntType):
     return value
@@ -116,14 +124,6 @@
     # mx.DateTime.strptime doesn't work on windows
     return mx.DateTime.mktime (time.strptime (value.value, '%Y%m%dT%H:%M:%S'))
 
-  # Boolean
-  elif hasattr (types, 'BooleanType') and \
-       isinstance (value, xmlrpclib.boolean):
-    if value:
-      return True
-    else:
-      return False
-
   # List
   elif isinstance (value, types.ListType):
     return [rpc_to_python (element, exception) for element in value]