Changeset 1460

Timestamp:

11/30/06 13:44:34

Author:

fumanchu

Message:

Renamed _cpwsgiserver.py to wsgiserver.py, to make it more clear that it's a public, reusable module. Also renamed _cpwsgi.WSGIServer to _cpwsgi.CPWSGIServer, to match the naming convention of the other subclasses in that module.

Files:

• trunk/cherrypy/_cpserver.py (modified) (1 diff)
• trunk/cherrypy/_cpwsgi.py (modified) (6 diffs)
• trunk/cherrypy/lib/wsgiapp.py (modified) (1 diff)
• trunk/cherrypy/test/test.py (modified) (1 diff)
• trunk/cherrypy/test/test_states.py (modified) (2 diffs)
• trunk/cherrypy/wsgiserver.py (moved) (moved from trunk/cherrypy/_cpwsgiserver.py)

trunk/cherrypy/_cpserver.py

@@ -75 +75 @@
-        if httpserver is None:
-            from cherrypy import _cpwsgi
-
+CP
-        if isinstance(httpserver, basestring):
-            httpserver = attributes(httpserver)()

trunk/cherrypy/_cpwsgi.py

@@ -5 +5 @@
-
-import cherrypy as _cherrypy
-_cp
+
-from cherrypy.lib import http as _http
-
@@ -237 +237 @@
-
-
-_cp
+
-    
-    def parse_request(self):
@@ -245 +245 @@
-        
-        try:
-_cp
+
-        except _http.MaxSizeExceeded:
-            self.simple_response("413 Request Entity Too Large")
@@ -258 +258 @@
-            self.rfile = _http.SizeCheckWrapper(self.rfile, mbs)
-        try:
-_cp
+
-        except _http.MaxSizeExceeded:
-            self.simple_response("413 Request Entity Too Large")
@@ -265 +265 @@
-
-
-_cp
+
-    
-    RequestHandlerClass = CPHTTPRequest
-
-
-WSGIServer(_cp
-
-_cp
-
-_cp
+CPWSGIServer(
+
+
+
+
-    so that it can be used in other frameworks and applications. Therefore,
-    we wrap it here, so we can set our own mount points from cherrypy.tree.
@@ -290 +290 @@
-            bind_addr = (server.socket_host, server.socket_port)
-        
-_cp
+
-        # We could just pass cherrypy.tree, but by passing tree.apps,
-        # we get correct SCRIPT_NAMEs as early as possible.

trunk/cherrypy/lib/wsgiapp.py

@@ -13 +13 @@
-
-def make_environ():
-_cp
+
-    
-    for hosting WSGI apps in non-WSGI environments (yikes!)

trunk/cherrypy/test/test.py

@@ -83 +83 @@
-
-class CommandLineParser(object):
-
+CP
-                         'cpmodpy': "cpmodpy",
-                         'modpygw': "modpygw",

trunk/cherrypy/test/test_states.py

@@ -333 +333 @@
-        print "Testing %s on %s:%s..." % (server, host, port)
-        run(server, conf)
-
+CP
-
-
@@ -347 +347 @@
-            print "Testing %s on %s:%s..." % (server, host, port)
-            run(server, conf)
-
+CP
-
-