Fix all macro arguments (need * and **)

diff --git a/macros/CgiVar.py b/macros/CgiVar.py
index 867bc87622acafc828e59db3cc2962349da4aa89..9708778dd80c77d52c6a970ea022525d7e57158d 100644 (file)
--- a/macros/CgiVar.py
+++ b/macros/CgiVar.py
@@ -1,7 +1,7 @@
-def _macro_CgiVar(argv, kvargs):
+def _macro_CgiVar(*args, *kvargs):
     return {
         'REMOTE_USER': remote_user(),
         'REMOTE_HOST': get_hostname(remote_host()),
         'REMOTE_ADDR': remote_host(),
         'QUERY_STRING': relative_url(query_string()),
-    }[argv[1]]
+    }[args[1]]

diff --git a/macros/HttpGet.py b/macros/HttpGet.py
index 391a14429e013e03788a4b930d3df03452c1ea66..bc122a927044ef87664c81ffdcfface45a01140e 100644 (file)
--- a/macros/HttpGet.py
+++ b/macros/HttpGet.py
@@ -1,6 +1,6 @@
-def _macro_HttpGet(args, kvargs):
+def _macro_HttpGet(*args, **kvargs):
     if args[1] in form:
-        return form[argv[1]].value
+        return form[args[1]].value
     elif len(args) > 2:
         return args[2] # default value
     raise Exception("Undefined argument " + args[1])

diff --git a/macros/HttpPost.py b/macros/HttpPost.py
index b7037c1627d5364745554d2df4dba806f77414f1..6bd5874475d02e9fb7099486c4ef84651aa8625a 100644 (file)
--- a/macros/HttpPost.py
+++ b/macros/HttpPost.py
@@ -1,4 +1,4 @@
-def _macro_HttpPost(args, kvargs):
+def _macro_HttpPost(*args, *kvargs):
     if args[1] in form:
         return form[argv[1]].value
     elif len(args) > 2:

diff --git a/macros/TitleIndex.py b/macros/TitleIndex.py
index 7212f2bd02a9de5464ac4f3dced488691c9d49b4..3754396be780d6cda829f1165dda1f4f7425f806 100644 (file)
--- a/macros/TitleIndex.py
+++ b/macros/TitleIndex.py
@@ -1,4 +1,4 @@
-def _macro_TitleIndex(args, kvargs):
+def _macro_TitleIndex(*args, **kvargs):
     s = make_index_key()
     pages = list(page_list())
     pages.sort()

diff --git a/macros/WordIndex.py b/macros/WordIndex.py
index 10fb34619e9a8a263e141a3bc3fdcbed38397add..b64a3171b85c6b3eede4990cc67ca43c4546923f 100644 (file)
--- a/macros/WordIndex.py
+++ b/macros/WordIndex.py
@@ -1,4 +1,4 @@
-def _macro_WordIndex(args, kvargs):
+def _macro_WordIndex(*args, **kvargs):
     s = make_index_key()
     pages = list(page_list())
     map = {}