--- a/createdoc.py	Sat Mar 24 00:07:40 2012 +0100
+++ b/createdoc.py	Sat Mar 24 01:05:34 2012 +0100
@@ -7,7 +7,7 @@
 
 import re
 import inspect
-from iro.user import User as Current
+from iro.view.xmlrpc_old import User as Current
 from iro.controller.viewinterface import Interface as New
 
 from createerm import createSchemaPlot, tables
@@ -30,7 +30,6 @@
 class Site(Link):
     pass
 
-
 class Keyword():
     def __init__(self,name,typ,description):
         self.name=name
@@ -94,7 +93,16 @@
         Link.__init__(self,name,title)
         m=methods[name]
         (args, varargs, keywords, defaults)=inspect.getargspec(m)
-        args= [b for b in args if b is not "self"]
+        a=[]
+        for b in args:
+            if b in ("self","session"):
+                continue
+            if b == "user":
+                a.append("apikey")
+            else:
+                a.append(b)
+        
+        args = a
         self.func_line=inspect.formatargspec(args, varargs, keywords, defaults)
         self.description = m.__doc__.split("\n")[0].decode("utf8")
         self.args=[Arg(a,m) for a in args]