Dolda2000 GitWeb
/
ashd.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated changelog.
[ashd.git]
/
python
/
ashd
/
wsgidir.py
diff --git
a/python/ashd/wsgidir.py
b/python/ashd/wsgidir.py
index
335a5d7
..
5ce7638
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.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
elif hasattr(mod.mod, "application"):
entry = mod.mod.application
mod.entry = entry
@@
-65,6
+65,13
@@
def chain(path, env, startreq):
return wsgiutil.simpleerror(env, startreq, 500, "Internal Error", "Invalid WSGI handler.")
exts["wsgi"] = chain
return wsgiutil.simpleerror(env, startreq, 500, "Internal Error", "Invalid WSGI handler.")
exts["wsgi"] = chain
+def addext(ext, handler):
+ p = handler.rindex('.')
+ mname = handler[:p]
+ hname = handler[p + 1:]
+ mod = __import__(mname, fromlist = ["dummy"])
+ exts[ext] = getattr(mod, hname)
+
def application(env, startreq):
if not "SCRIPT_FILENAME" in env:
return wsgiutil.simpleerror(env, startreq, 500, "Internal Error", "The server is erroneously configured.")
def application(env, startreq):
if not "SCRIPT_FILENAME" in env:
return wsgiutil.simpleerror(env, startreq, 500, "Internal Error", "The server is erroneously configured.")
@@
-78,5
+85,9
@@
def application(env, startreq):
return wsgiutil.simpleerror(env, startreq, 500, "Internal Error", "The server is erroneously configured.")
return(exts[ext](path, 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):
+ for arg in argv:
+ if arg[0] == '.':
+ p = arg.index('=')
+ addext(arg[1:p], arg[p + 1:])
return application
return application