python: Changed wmain calling convention.

diff --git a/python/ashd-wsgi b/python/ashd-wsgi
index beb39ca91f7fad13c8213fa8fd0d0cfd10c71f48..e8f843544b636ec21b489d26f4339ea206cc7ce0 100755 (executable)
--- a/python/ashd-wsgi
+++ b/python/ashd-wsgi
@@ -29,7 +29,7 @@ if not modwsgi_compat:
     if not hasattr(handlermod, "wmain"):
         sys.stderr.write("ashd-wsgi: handler %s has no `wmain' function\n" % args[0])
         sys.exit(1)
-    handler = handlermod.wmain(args[1:])
+    handler = handlermod.wmain(*args[1:])
 else:
     if not hasattr(handlermod, "application"):
         sys.stderr.write("ashd-wsgi: handler %s has no `application' object\n" % args[0])

diff --git a/python/ashd/wsgidir.py b/python/ashd/wsgidir.py
index 335a5d797e6664b52832ec9b6f8836fcea9499fa..e5dee720b22671964534c15a72bd875863967b3b 100644 (file)
--- a/python/ashd/wsgidir.py
+++ b/python/ashd/wsgidir.py
@@ -54,7 +54,7 @@ def chain(path, env, startreq):
                 entry = mod.entry
             else:
                 if hasattr(mod.mod, "wmain"):
-                    entry = mod.mod.wmain([])
+                    entry = mod.mod.wmain()
                 elif hasattr(mod.mod, "application"):
                     entry = mod.mod.application
                 mod.entry = entry
@@ -78,5 +78,5 @@ def application(env, startreq):
         return wsgiutil.simpleerror(env, startreq, 500, "Internal Error", "The server is erroneously configured.")
     return(exts[ext](path, env, startreq))
 
-def wmain(argv):
+def wmain(*argv):
     return application

diff --git a/python/scgi-wsgi b/python/scgi-wsgi
index 42585669286e38cb0e821806be664110a342f5e0..006f3757d068d5199c900f5dd4b18a3b4acbe172 100755 (executable)
--- a/python/scgi-wsgi
+++ b/python/scgi-wsgi
@@ -48,7 +48,7 @@ if not modwsgi_compat:
     if not hasattr(handlermod, "wmain"):
         sys.stderr.write("scgi-wsgi: handler %s has no `wmain' function\n" % args[0])
         sys.exit(1)
-    handler = handlermod.wmain(args[1:])
+    handler = handlermod.wmain(*args[1:])
 else:
     if not hasattr(handlermod, "application"):
         sys.stderr.write("scgi-wsgi: handler %s has no `application' object\n" % args[0])