X-Git-Url: https://git.linta.de/?p=~helmut%2Fonoff.git;a=blobdiff_plain;f=dbus_client.py;h=fbaf33a26571c6d921450fd6a939ffbfe679e6ed;hp=91d9f37adce8d486c1c122540c52ab90052489c3;hb=ebb54f285c50e188cf3548de99072c0b082ed742;hpb=3e548ddf39ce2c984943eaaa04a56e1d517b3357

diff --git a/dbus_client.py b/dbus_client.py
index 91d9f37..fbaf33a 100755
--- a/dbus_client.py
+++ b/dbus_client.py
@@ -8,7 +8,6 @@ released.
 
 import argparse
 import os
-import xml.parsers.expat
 
 from dbus.mainloop.glib import DBusGMainLoop
 from gi.repository import GObject
@@ -24,21 +23,6 @@ def wait_for_signal(proxy, signal, desired_state):
     proxy.connect_to_signal(signal, callback)
     loop.run()
 
-def parse_introspection(xmlstring):
-    parser = xml.parsers.expat.ParserCreate()
-    nodes = []
-    def start_element(name, attrs):
-        if name != "node":
-            return
-        try:
-            value = attrs["name"]
-        except KeyError:
-            return
-        nodes.append(value)
-    parser.StartElementHandler = start_element
-    parser.Parse(xmlstring)
-    return nodes
-
 def main():
     parser = argparse.ArgumentParser(parents=[onoff.dbusutils.dbus_options])
     parser.add_argument("--duration", type=int, default=10,
@@ -53,8 +37,7 @@ def main():
     DBusGMainLoop(set_as_default=True)
     if args.list:
         bus = onoff.dbusutils.get_dbus(args)
-        proxy = bus.get_object(args.busname, onoff.dbusutils.object_prefix)
-        for elem in parse_introspection(proxy.Introspect()):
+        for elem in onoff.dbusutils.list_objects(bus, args.busname):
             print(elem)
     elif args.command:
         proxy = onoff.dbusutils.get_dbus_proxy(args)