calling unwatch can have the affect of only removing the callback

Author: Brendan Whitfield

obd/async.py

@@ -109,17 +109,18 @@ def unwatch(self, c, callback=None):
 
 		debug("Unwatching command: %s" % str(c))
 
-		# if a callback was specified, only remove the callback 
-		if hasattr(callback, "__call__") and (callback in self.callbacks[c]):
-			self.callbacks[c].remove(callback)
-
-			# if no more callbacks are left, remove the command entirely
-			if len(self.callbacks[c]) === 0:
+		if c in self.commands:
+			# if a callback was specified, only remove the callback 
+			if hasattr(callback, "__call__") and (callback in self.callbacks[c]):
+				self.callbacks[c].remove(callback)
+
+				# if no more callbacks are left, remove the command entirely
+				if len(self.callbacks[c]) == 0:
+					self.commands.pop(c, None)
+			else:
+				# no callback was specified, pop everything
+				self.callbacks.pop(c, None)
 				self.commands.pop(c, None)
-		else:
-			# no callback was specified, pop everything
-			self.callbacks.pop(c, None)
-			self.commands.pop(c, None)
 
 
 		# start if neccessary
@@ -128,10 +129,19 @@ def unwatch(self, c, callback=None):
 
 
 	def unwatch_all(self):
-		commands = self.commands.keys()
+		debug("Unwatching all")
+
+		# if running, the daemon thread must be stopped before altering the command dict
+		was_running = self.running
+		if self.running:
+			self.stop()
+
+		self.commands  = {}
+		self.callbacks = {}
 
-		for c in commands:
-			self.unwatch(c)
+		# start if neccessary
+		if was_running:
+			self.start()
 
 
 	def query(self, c):
@@ -156,8 +166,8 @@ def run(self):
 					self.commands[c] = r
 
 					# fire the callback, if we have one
-					if c in self.callbacks:
-						self.callbacks[c](r)
+					for callback in self.callbacks[c]:
+						callback(r)
 
 			else:
 				time.sleep(1) # idle until the user calls stop() or watch()

obd/obd.py

@@ -45,6 +45,7 @@ def __init__(self, portstr=None):
 
 		# initialize by connecting and loading sensors
 		self.connect(portstr)
+		debug("========================================")
 
 
 	def connect(self, portstr=None):