--- a/iro/model/user.py	Thu Jan 26 01:18:47 2012 +0100
+++ b/iro/model/user.py	Thu Jan 26 01:20:03 2012 +0100
@@ -4,8 +4,6 @@
 from .utils import DBDefer
 from ..validate import vuserhash, validate
 from ..error import UserNotFound, InterfaceException
-
-
 dbdefer=DBDefer(None)
 
 def setEngine(engine,autocommit=False): 
@@ -13,9 +11,9 @@
     dbdefer.autocommit = autocommit
 
 @dbdefer
-@validate(userhash=vuserhash)
-def getuser(userhash, session):
-    user = session.query(User).filter_by(apikey=userhash).first()
+@validate(apikey=vuserhash)
+def getuser(apikey, session):
+    user = session.query(User).filter_by(apikey=apikey).first()
     if user is None:
         raise UserNotFound()
     else:
@@ -25,14 +23,16 @@
     def new_f(*args,**kargs):
         kp=getcallargs(f,*args,**kargs)
         try:
-            userhash = kp["user"]
+            apikey = kp["user"]
         except KeyError:
             raise InterfaceException() 
         
         def _gotResult(_user):
             kp["user"]=_user
             return f(**kp)
-        return getuser(userhash).addCallback(_gotResult)
+
+        d=getuser(apikey=apikey)
+        return d.addCallback(_gotResult)
 
     new_f.__name__ = f.__name__
     return new_f