diff --git a/src/bridge/DBus.py b/src/bridge/DBus.py index a670a35e..14d28717 100755 --- a/src/bridge/DBus.py +++ b/src/bridge/DBus.py @@ -332,7 +332,7 @@ class DbusObject(dbus.service.Object): i+=1 return attr_string - def addMethod(self, name, int_suffix, in_sign, out_sign): + def addMethod(self, name, int_suffix, in_sign, out_sign, doc={}): """Dynamically add a method to Dbus Bridge""" #FIXME: Better way ??? attributes = self.__attribute_string(in_sign) @@ -346,7 +346,7 @@ class DbusObject(dbus.service.Object): func_table = self._dbus_class_table[self.__class__.__module__ + '.' + self.__class__.__name__][function._dbus_interface] func_table[function.__name__] = function #Needed for introspection - def addSignal(self, name, int_suffix, signature): + def addSignal(self, name, int_suffix, signature, doc={}): """Dynamically add a signal to Dbus Bridge""" #FIXME: Better way ??? attributes = self.__attribute_string(signature) @@ -416,12 +416,12 @@ class DBusBridge(Bridge): debug("registering DBus bridge method [%s]", name) self.dbus_bridge.register(name, callback) - def addMethod(self, name, int_suffix, in_sign, out_sign, method): + def addMethod(self, name, int_suffix, in_sign, out_sign, method, doc={}): """Dynamically add a method to Dbus Bridge""" print ("Adding method [%s] to DBus bridge" % name) self.dbus_bridge.addMethod(name, int_suffix, in_sign, out_sign) self.register(name, method) - def addSignal(self, name, int_suffix, signature): + def addSignal(self, name, int_suffix, signature, doc={}): self.dbus_bridge.addSignal(name, int_suffix, signature) setattr(DBusBridge, name, getattr(self.dbus_bridge, name)) diff --git a/src/bridge/bridge_constructor/dbus_core_template.py b/src/bridge/bridge_constructor/dbus_core_template.py index b2705359..bbd6db2d 100644 --- a/src/bridge/bridge_constructor/dbus_core_template.py +++ b/src/bridge/bridge_constructor/dbus_core_template.py @@ -84,7 +84,7 @@ class DbusObject(dbus.service.Object): i+=1 return attr_string - def addMethod(self, name, int_suffix, in_sign, out_sign): + def addMethod(self, name, int_suffix, in_sign, out_sign, doc={}): """Dynamically add a method to Dbus Bridge""" #FIXME: Better way ??? attributes = self.__attribute_string(in_sign) @@ -98,7 +98,7 @@ class DbusObject(dbus.service.Object): func_table = self._dbus_class_table[self.__class__.__module__ + '.' + self.__class__.__name__][function._dbus_interface] func_table[function.__name__] = function #Needed for introspection - def addSignal(self, name, int_suffix, signature): + def addSignal(self, name, int_suffix, signature, doc={}): """Dynamically add a signal to Dbus Bridge""" #FIXME: Better way ??? attributes = self.__attribute_string(signature) @@ -127,13 +127,13 @@ class DBusBridge(Bridge): debug("registering DBus bridge method [%s]", name) self.dbus_bridge.register(name, callback) - def addMethod(self, name, int_suffix, in_sign, out_sign, method): + def addMethod(self, name, int_suffix, in_sign, out_sign, method, doc={}): """Dynamically add a method to Dbus Bridge""" print ("Adding method [%s] to DBus bridge" % name) self.dbus_bridge.addMethod(name, int_suffix, in_sign, out_sign) self.register(name, method) - def addSignal(self, name, int_suffix, signature): + def addSignal(self, name, int_suffix, signature, doc={}): self.dbus_bridge.addSignal(name, int_suffix, signature) setattr(DBusBridge, name, getattr(self.dbus_bridge, name))