changeset 643:8ed1a953d12e

fix the server adaptor scripts to hopefully match the new request module
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Fri, 12 May 2006 23:14:20 +0200
parents 652e0e01f2b7
children 7bf4afe634ed
files wiki/server/moin.cgi wiki/server/moin.fcg wiki/server/moinmodpy.htaccess wiki/server/moinmodpy.py wiki/server/mointwisted wiki/server/moinwsgi.py
diffstat 6 files changed, 11 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/wiki/server/moin.cgi	Fri May 12 22:56:20 2006 +0200
+++ b/wiki/server/moin.cgi	Fri May 12 23:14:20 2006 +0200
@@ -36,9 +36,10 @@
     prof = hotshot.Profile("moin.prof")
     prof.start()
 
-from MoinMoin.request import RequestCGI
-request = RequestCGI()
+from MoinMoin.request import CGI
+request = CGI.Request()
 request.run()
 
 if hotshotProfiler:
     prof.close()
+
--- a/wiki/server/moin.fcg	Fri May 12 22:56:20 2006 +0200
+++ b/wiki/server/moin.fcg	Fri May 12 23:14:20 2006 +0200
@@ -40,11 +40,11 @@
 config.use_threads = use_threads
 del config
 
-from MoinMoin.request import RequestFastCGI
+from MoinMoin.request import FCGI
 from MoinMoin.support import thfcgi
 
 def handle_request(req, env, form):
-    request = RequestFastCGI(req, env, form)
+    request = FCGI.Request(req, env, form)
     request.run()
 
 if __name__ == '__main__':
--- a/wiki/server/moinmodpy.htaccess	Fri May 12 22:56:20 2006 +0200
+++ b/wiki/server/moinmodpy.htaccess	Fri May 12 23:14:20 2006 +0200
@@ -39,6 +39,6 @@
 #  PythonPath "['/path/to/moin/lib/python','/path/to/wikiconfig']+sys.path"
 #
 #  # choose the ModPy Request class as handler
-#  PythonHandler MoinMoin.request::RequestModPy.run
+#  PythonHandler MoinMoin.request.MODPY::Request.run
 #
 #</Files>
--- a/wiki/server/moinmodpy.py	Fri May 12 22:56:20 2006 +0200
+++ b/wiki/server/moinmodpy.py	Fri May 12 23:14:20 2006 +0200
@@ -54,9 +54,9 @@
 del config
 
 
-from MoinMoin.request import RequestModPy
+from MoinMoin.request import MODPY
 
 def handler(request):
-    moinreq = RequestModPy(request)
+    moinreq = MODPY.Request(request)
     return moinreq.run(request)
 
--- a/wiki/server/mointwisted	Fri May 12 22:56:20 2006 +0200
+++ b/wiki/server/mointwisted	Fri May 12 23:14:20 2006 +0200
@@ -24,4 +24,5 @@
 
 
 script = TwistedScript(Config.name, None)
-script.run()
\ No newline at end of file
+script.run()
+
--- a/wiki/server/moinwsgi.py	Fri May 12 22:56:20 2006 +0200
+++ b/wiki/server/moinwsgi.py	Fri May 12 23:14:20 2006 +0200
@@ -21,3 +21,4 @@
     server = WSGIServer(moinmoinApp, bindAddress=unixSocketPath)
     server.run()
     os.unlink(unixSocketPath)
+