Changeset 1245
- Timestamp:
- 08/15/06 20:19:42
- Files:
-
- branches/cp3-wsgi-remix/_cprequest.py (modified) (1 diff)
- branches/cp3-wsgi-remix/_cptree.py (modified) (1 diff)
- branches/cp3-wsgi-remix/_cpwsgi.py (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/cp3-wsgi-remix/_cprequest.py
r1244 r1245 161 161 self.process_headers() 162 162 163 if self.app is None: 164 # Some interfaces (like WSGI) may have already set self.app. 165 # If not, look up the app for this path. 166 self.script_name = r = cherrypy.tree.script_name(self.path) 167 if r is None: 168 raise cherrypy.NotFound() 169 self.app = cherrypy.tree.apps[r] 170 else: 171 self.script_name = self.wsgi_environ.get('SCRIPT_NAME', '') 163 self.script_name = self.wsgi_environ.get('SCRIPT_NAME', '') 172 164 173 165 # path_info should be the path from the branches/cp3-wsgi-remix/_cptree.py
r1244 r1245 34 34 # Handle WSGI callables 35 35 elif callable(app) and wrap: 36 app = HostedWSGI(app)36 app = Application(HostedWSGI(app), script_name, conf) 37 37 # In all other cases leave the app intact (no wrapping) 38 38 branches/cp3-wsgi-remix/_cpwsgi.py
r1244 r1245 169 169 'tools.wsgiapp.app': app, 170 170 } 171 172 def __call__(self, environ, start_response): 173 return self.app(environ, start_response) 171 174 172 175 173 # Server components #
