Merge pull request #10 from compas-dev/not-fail-on-off

Ensure no fail at `unsubscribe_by_id`

CHANGELOG.md

@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changed
 
+* Ensure calling `off()` or `unsubscribe()` does not fail if the callback is not present in the registered event callbacks.
+
 ### Removed
 
 

src/compas_eve/event_emitter.py

@@ -223,11 +223,19 @@ def g(*args, **kwargs):
 
     def off(self, event, f):
         """Removes the function ``f`` from ``event``."""
-        self._events[event].pop(f)
+        with self._event_lock:
+            if f in self._events[event]:
+                return self._events[event].pop(f)
+
+        return None
 
     def remove_listener(self, event, f):
         """Removes the function ``f`` from ``event``."""
-        self._events[event].pop(f)
+        with self._event_lock:
+            if f in self._events[event]:
+                return self._events[event].pop(f)
+
+        return None
 
     def remove_all_listeners(self, event=None):
         """Remove all listeners attached to ``event``.