[pkg-fso-commits] [SCM] Various useful tools for an FSO installation branch, master, updated. debian/0.git20080812.2-32-gb5a13bb

[Michael 'Mickey' Lauer]

The following commit has been merged in the master branch:
commit a63379b41241e6529e027e7ae812628a8f1f9f0b
Author: Michael 'Mickey' Lauer <mickey at vanille-media.de>
Date:   Thu Oct 16 19:19:24 2008 +0200

    mdbus: improve pretty printer to cover more cases

diff --git a/mickeydbus/mdbus b/mickeydbus/mdbus
index b18db80..f81eeb5 100755
--- a/mickeydbus/mdbus
+++ b/mickeydbus/mdbus
@@ -7,7 +7,7 @@ Mickey's own dbus introspection utility.
 GPLv2 or later
 """
 
-__version__ = "0.9.9.5"
+__version__ = "0.9.9.6"
 
 from xml.parsers.expat import ExpatError, ParserCreate
 from dbus.exceptions import IntrospectionParserException
@@ -162,18 +162,19 @@ def process_introspection_data(data):
     except Exception, e:
         raise IntrospectionParserException('%s: %s' % (e.__class__, e))
 
+import types
 #----------------------------------------------------------------------------#
 def dbus_to_python(v):
 #----------------------------------------------------------------------------#
-    if isinstance(v, dbus.Int32):
+    if isinstance(v, dbus.Int32) or type(v) == types.IntType:
         return int(v)
-    elif isinstance(v, dbus.String):
+    elif isinstance(v, dbus.String) or type(v) == types.StringType:
         return str(v)
-    elif isinstance(v, dbus.Dictionary):
+    elif isinstance(v, dbus.Dictionary) or type(v) == types.DictType:
         return dict( (dbus_to_python(k), dbus_to_python(v)) for k,v in v.iteritems() )
-    elif isinstance(v, dbus.Array):
+    elif isinstance(v, dbus.Array) or type(v) == types.ListType:
         return [dbus_to_python(x) for x in v]
-    elif isinstance(v, dbus.Struct):
+    elif isinstance(v, dbus.Struct) or type(v) == types.TupleType:
         return tuple(dbus_to_python(x) for x in v)
     else:
         raise TypeError("Can't convert type %s to python object" % type(v))

-- 
Various useful tools for an FSO installation