summaryrefslogtreecommitdiffstats
path: root/python
diff options
context:
space:
mode:
Diffstat (limited to 'python')
-rw-r--r--python/Makefile.am2
-rw-r--r--python/_dbus.py12
-rw-r--r--python/proxies.py5
3 files changed, 10 insertions, 9 deletions
diff --git a/python/Makefile.am b/python/Makefile.am
index a688a13c..52ba8e5b 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -5,7 +5,7 @@ INCLUDES=-I$(srcdir)/$(top_builddir) -I$(srcdir)/$(top_builddir)/dbus $(DBUS_CLI
dbusmoduledir = $(pyexecdir)
dbusmodule_PYTHON = dbus.pth
-dbusdir = $(pythondir)/dbus
+dbusdir = $(pyexecdir)/dbus
dbus_PYTHON = __init__.py _dbus.py decorators.py exceptions.py service.py proxies.py _util.py types.py matchrules.py glib.py
dbusbindingsdir = $(pyexecdir)/dbus
diff --git a/python/_dbus.py b/python/_dbus.py
index 2a290bd6..890cdda8 100644
--- a/python/_dbus.py
+++ b/python/_dbus.py
@@ -126,7 +126,7 @@ class Bus:
def add_signal_receiver(self, handler_function,
signal_name=None,
- dbus_inteface=None,
+ dbus_interface=None,
named_service=None,
path=None,
**keywords):
@@ -149,7 +149,7 @@ class Bus:
dbus_bindings.bus_add_match(self._connection, repr(match_rule))
def remove_signal_receiver(self, handler_function,
- signal_name=None,
+ signal_name=None,
dbus_interface=None,
named_service=None,
path=None,
@@ -166,8 +166,8 @@ class Bus:
if (args_dict):
match_rule.add_args_match(args_dict)
- if (handler_function):
- match_rule.add_handler(handler_function)
+ if (handler_function):
+ match_rule.add_handler(handler_function)
self._match_rule_tree.remove(match_rule)
@@ -224,11 +224,11 @@ class Interface:
self._obj = object
self._dbus_interface = dbus_interface
- def connect_to_signal(self, signal_name, handler_function, dbus_interface = None):
+ def connect_to_signal(self, signal_name, handler_function, dbus_interface = None, **keywords):
if not dbus_interface:
dbus_interface = self._dbus_interface
- self._obj.connect_to_signal(signal_name, handler_function, dbus_interface)
+ self._obj.connect_to_signal(signal_name, handler_function, dbus_interface, **keywords)
def __getattr__(self, member, **keywords):
if (keywords.has_key('dbus_interface')):
diff --git a/python/proxies.py b/python/proxies.py
index c7dc02be..42866426 100644
--- a/python/proxies.py
+++ b/python/proxies.py
@@ -105,12 +105,13 @@ class ProxyObject:
(result, self._pending_introspect) = self._Introspect()
- def connect_to_signal(self, signal_name, handler_function, dbus_interface=None):
+ def connect_to_signal(self, signal_name, handler_function, dbus_interface=None, **keywords):
self._bus.add_signal_receiver(handler_function,
signal_name=signal_name,
dbus_interface=dbus_interface,
named_service=self._named_service,
- path=self._object_path)
+ path=self._object_path,
+ **keywords)
def _Introspect(self):
message = dbus_bindings.MethodCall(self._object_path, 'org.freedesktop.DBus.Introspectable', 'Introspect')