# HG changeset patch
# User Sandro Knauß <knauss@netzguerilla.net>
# Date 1324500650 -3600
# Node ID edf7e94cd6079754786e56a15fa93c5b9f7a7f93
# Parent  741df1947e6d20a54e7e7705a484ba55f0fc10b3
user Decorator in einen try block

diff -r 741df1947e6d -r edf7e94cd607 iro/newinterface.py
--- a/iro/newinterface.py	Wed Dec 21 21:49:58 2011 +0100
+++ b/iro/newinterface.py	Wed Dec 21 21:50:50 2011 +0100
@@ -36,19 +36,16 @@
 def with_user(f):
     def new_f(*args,**kargs):
         args=list(args)
+        logging.debug("Entering %s"%f.__name__)
         try:
-            logging.debug("Entering %s"%f.__name__)
-            try:
-                kargs["user"]=getuser(kargs["apikey"])
-                del kargs["apikey"]
-            except KeyError:
-                kargs["user"]=getuser(args[1])
-                del args[1]
-            ret=f(*args,**kargs)
-            logging.debug("Exited %s"%f.__name__)
-            return ret
-        except InterfaceException, e:
-            return e.dict()
+            kargs["user"]=getuser(kargs["apikey"])
+            del kargs["apikey"]
+        except KeyError:
+            kargs["user"]=getuser(args[1])
+            del args[1]
+        ret=f(*args,**kargs)
+        logging.debug("Exited %s"%f.__name__)
+        return ret
     new_f.__name__ = f.__name__
     return new_f