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

[Jan Luebbe]

The following commit has been merged in the master branch:
commit e6c7d3ef37615978219f090d71509fd8a2676da8
Author: Jan Luebbe <jluebbe at debian.org>
Date:   Thu Jan 29 14:04:33 2009 +0100

    mdbus: also use prettyPrint for signals

diff --git a/mickeydbus/mdbus b/mickeydbus/mdbus
index 3ff9793..89461bb 100755
--- a/mickeydbus/mdbus
+++ b/mickeydbus/mdbus
@@ -11,6 +11,7 @@ __version__ = "0.9.9.10"
 
 from xml.parsers.expat import ExpatError, ParserCreate
 from dbus.exceptions import IntrospectionParserException
+import types
 
 #----------------------------------------------------------------------------#
 class _Parser(object):
@@ -162,8 +163,6 @@ def process_introspection_data(data):
     except Exception, e:
         raise IntrospectionParserException('%s: %s' % (e.__class__, e))
 
-import types
-
 #----------------------------------------------------------------------------#
 def dbus_to_python(v):
 #----------------------------------------------------------------------------#
@@ -337,10 +336,6 @@ class Commands( object ):
             signature = self._signature( properties[mname][0] )
             print "[PROPERTY]  %s.%s%s" % ( name, mname, signature )
 
-    def _prettyPrint( self, result ):
-        # FIXME pretty printing...
-        print result
-
     #
     # listening mode
     #
@@ -380,7 +375,7 @@ class Commands( object ):
     def _signalHandler( self, *args, **kwargs ):
         timestamp = time.strftime("%Y%m%d.%H%M.%S") if timestamps else ""
         print "%s [SIGNAL]    %s.%s    from %s %s" % ( timestamp, kwargs["interface"], kwargs["member"], kwargs["sender"], kwargs["path"] )
-        self._prettyPrint( args )
+        prettyPrint( args )
 
 #----------------------------------------------------------------------------#
 if __name__ == "__main__":

-- 
Various useful tools for an FSO installation