version correction in debian/changelog

[dbuscron] / dbuscron / bus.py

diff --git a/dbuscron/bus.py b/dbuscron/bus.py
index c766860..2bf9116 100644 (file)
--- a/dbuscron/bus.py
+++ b/dbuscron/bus.py
@@ -1,6 +1,22 @@
 
 import dbus
 
+from dbuscron.logger import Logger
+log = Logger(__name__)
+
+def dbus_to_str(value):
+    log('converting', value, 'of type', type(value))
+    if isinstance(value, dbus.Byte):
+        return str(int(value))
+    elif isinstance(value, dbus.ByteArray):
+        return ','.join(str(ord(v)) for v in value)
+    elif isinstance(value, dbus.Array):
+        return ','.join(dbus_to_str(v) for v in value)
+    elif isinstance(value, dbus.Dictionary):
+        return ','.join('%s:%s' % (k, dbus_to_str(v)) for k, v in value.iteritems())
+    else:
+        return str(value)
+
 def get_dbus_message_type(message):
     result = message.__class__.__name__[0:-7]
     for c in 'ABCDEFGHIJKLMNOPQRSTUVWXYZ':
@@ -57,7 +73,15 @@ class DbusRule(object):
     def register(self):
         rule = str(self)
         if rule:
-            self._bus.add_match_string(str(self))
+            self._bus.add_match_string(rule)
+
+    def unregister(self):
+        rule = str(self)
+        if rule:
+            self._bus.remove_match_string(rule)
+
+    def __del__(self):
+       self.unregister()
 
     def __str__(self):
         rule = []
@@ -102,7 +126,7 @@ class DbusRule(object):
             for i, arg in enumerate(args_):
                 if i >= len(self._args):
                     break
-                if self._args[i] not in (None, arg):
+                if self._args[i] not in (None, str(arg)):
                     return False
 
         return True