implement side-by-side-equal composition

1 files changed, 12 insertions, 17 deletions

diff --git a/voctocore/lib/controlserver.py b/voctocore/lib/controlserver.py
index e267ca7..2b96152 100644
--- a/voctocore/lib/controlserver.py
+++ b/voctocore/lib/controlserver.py
@@ -90,20 +90,15 @@ class ControlServer():
 			return False, 'unknown command %s' % command
 
 
-		try:
-			# fetch the function-pointer
-			f = getattr(self.commands, command)
-
-			# call the function
-			ret = f(*args)
-
-			# if it returned an iterable, probably (Success, Message), pass that on
-			if hasattr(ret, '__iter__'):
-				return ret
-			else:
-				# otherwise construct a tuple
-				return (ret, None)
-
-		except Exception as e:
-			# In case of an Exception, return that
-			return False, str(e)
+		# fetch the function-pointer
+		f = getattr(self.commands, command)
+
+		# call the function
+		ret = f(*args)
+
+		# if it returned an iterable, probably (Success, Message), pass that on
+		if hasattr(ret, '__iter__'):
+			return ret
+		else:
+			# otherwise construct a tuple
+			return (ret, None)