diff options
author | John (J5) Palmieri <johnp@redhat.com> | 2005-07-15 02:15:08 +0000 |
---|---|---|
committer | John (J5) Palmieri <johnp@redhat.com> | 2005-07-15 02:15:08 +0000 |
commit | dc4d80e56775c1a69a51f196aec1bd331a645749 (patch) | |
tree | e6fb5461986a216dc64a529004392f8a859472b6 /python/matchrules.py | |
parent | 6c191520c8b33cd7e550a6e3d9d853c25f552f54 (diff) |
* python/_dbus.py (Bus::remove_signal_receiver):
don't add a callback to the match if none has been passed in
* python/matchrules.py (SignalMatchTree::remove): if the rule
being matched does not have a callback treat it as a wildcard
fix matching logic
* doc/dbus-tutorial.xml: Add Python tutorial
Diffstat (limited to 'python/matchrules.py')
-rw-r--r-- | python/matchrules.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/python/matchrules.py b/python/matchrules.py index 6d5fcd86..9a7edb3e 100644 --- a/python/matchrules.py +++ b/python/matchrules.py @@ -52,7 +52,7 @@ class SignalMatchNode: def remove_child(self, child, key=None): if self.wildcard == child: self.wildcard = None - elif self.finite.had_key(key): + elif self.finite.has_key(key): del self.finite[key] class SignalMatchTree: @@ -139,11 +139,15 @@ class SignalMatchRule: self.dbus_interface == rule.dbus_interface and self.sender == rule.sender and self.path == rule.path): - _funcs_copy_a = self.dbus.handler_functions[0:] - _funcs_copy_b = rule.dbus.handler_functions[0:] + if rule.handler_functions == []: + return True + + _funcs_copy_a = self.handler_functions[0:] + _funcs_copy_b = rule.handler_functions[0:] _funcs_copy_a.sort() _funcs_copy_b.sort() - return a == b + + return _funcs_copy_a == _funcs_copy_b return False |