Update all macros to take 2 arguments (args, kvargs)

diff --git a/macros/CgiVar.py b/macros/CgiVar.py
index 919951438ece1758ce599f751ada856026ecc97d..867bc87622acafc828e59db3cc2962349da4aa89 100644 (file)
--- a/macros/CgiVar.py
+++ b/macros/CgiVar.py
@@ -1,4 +1,4 @@
-def _macro_CgiVar(argv):
+def _macro_CgiVar(argv, kvargs):
     return {
         'REMOTE_USER': remote_user(),
         'REMOTE_HOST': get_hostname(remote_host()),

diff --git a/macros/HttpGet.py b/macros/HttpGet.py
index 7a4b54893fb8e6ff3b1d3a6c924b36f6f4804af1..391a14429e013e03788a4b930d3df03452c1ea66 100644 (file)
--- a/macros/HttpGet.py
+++ b/macros/HttpGet.py
@@ -1,6 +1,6 @@
-def _macro_HttpGet(argv):
-    if argv[1] in form:
+def _macro_HttpGet(args, kvargs):
+    if args[1] in form:
         return form[argv[1]].value
-    elif len(argv) > 2:
-        return argv[2] # default value
-    return ''
+    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 ce61f79fed721d4f75dbbeb959dee42bfa44feb4..b7037c1627d5364745554d2df4dba806f77414f1 100644 (file)
--- a/macros/HttpPost.py
+++ b/macros/HttpPost.py
@@ -1,6 +1,6 @@
-def _macro_HttpPost(argv):
-    if argv[1] in form:
+def _macro_HttpPost(args, kvargs):
+    if args[1] in form:
         return form[argv[1]].value
-    elif len(argv) > 2:
-        return argv[2] # default value
-    return ''
+    elif len(args) > 2:
+        return args[2] # default value
+    raise Exception("Undefined argument " + args[1])

diff --git a/macros/TitleIndex.py b/macros/TitleIndex.py
index 04d50197894cc51ba79ac64c5e6f9035dee7dc38..7212f2bd02a9de5464ac4f3dced488691c9d49b4 100644 (file)
--- a/macros/TitleIndex.py
+++ b/macros/TitleIndex.py
@@ -1,4 +1,4 @@
-def _macro_TitleIndex(argv):
+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 6438d0b932d6bb8dc4794bd6ca82527a44e865a9..10fb34619e9a8a263e141a3bc3fdcbed38397add 100644 (file)
--- a/macros/WordIndex.py
+++ b/macros/WordIndex.py
@@ -1,4 +1,4 @@
-def _macro_WordIndex(argv):
+def _macro_WordIndex(args, kvargs):
     s = make_index_key()
     pages = list(page_list())
     map = {}