--- 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