Fix multiple event handlers, resolves #9

Author: Jeroen van der Heijden

thingsdb/model/eventhandler.py

@@ -19,10 +19,9 @@ def on_warning(self, warn):
 
     def on_watch_init(self, data):
         thing_dict = data['thing']
-        thing_id = thing_dict.pop('#')
+        thing_id = thing_dict['#']
         thing = self._collection._things.get(thing_id)
         if thing is None:
-            thing_dict['#'] = thing_id  # restore `thing_dict`
             logging.debug(
                 f'Cannot init #{thing_id} since the thing is not registerd '
                 f'for watching by collection `{self._collection._name}`')
@@ -46,7 +45,7 @@ def on_watch_update(self, data):
                 f'for watching by collection `{self._collection._name}`')
             return
 
-        thing.on_update(data['event'], data.pop('jobs'))
+        thing.on_update(data['event'], data['jobs'])
 
     def on_watch_delete(self, data):
         thing_id = data['#']
@@ -62,4 +61,3 @@ def on_watch_stop(self, data):
         thing = self._collection._things.get(thing_id)
         if thing is not None:
             thing.on_stop()
-

thingsdb/model/thing.py

@@ -201,6 +201,9 @@ def _job_set(self, pairs):
         cls = self.__class__
 
         for k, v in pairs.items():
+            if k == '#':
+                continue
+
             prop = cls._props.get(k)
             if prop:
                 convert = prop.vconv

thingsdb/version.py

@@ -1 +1 @@
-__version__ = '0.6.7'
+__version__ = '0.6.8'