[z3-checkins] r38041 - z3/deliverance/branches/cache_aware/deliverance

[ltucker at codespeak.net]

Author: ltucker
Date: Wed Feb  7 00:30:17 2007
New Revision: 38041

Modified:
   z3/deliverance/branches/cache_aware/deliverance/wsgimiddleware.py
Log:
remove deliverance error page, propagate all exceptions

Modified: z3/deliverance/branches/cache_aware/deliverance/wsgimiddleware.py
==============================================================================
--- z3/deliverance/branches/cache_aware/deliverance/wsgimiddleware.py	(original)
+++ z3/deliverance/branches/cache_aware/deliverance/wsgimiddleware.py	Wed Feb  7 00:30:17 2007
@@ -148,53 +148,40 @@
         using the transformation specified in the 
         initializer. 
         """
-        try:
-            qs = environ.get('QUERY_STRING', '')
-            environ[DELIVERANCE_BASE_URL] = construct_url(environ, with_path_info=False, with_query_string=False)
-            environ[DELIVERANCE_CACHE] = {} 
-            notheme = 'notheme' in qs
-            if notheme:
-                return self.app(environ, start_response)
-
-            # unsupported 
-            if 'HTTP_ACCEPT_ENCODING' in environ:
-                environ['HTTP_ACCEPT_ENCODING'] = '' 
-            if 'HTTP_IF_MATCH' in environ: 
-                environ['HTTP_IF_MATCH'] = '' 
-            if 'HTTP_IF_UNMODIFIED_SINCE' in environ: 
-                environ['HTTP_IF_UNMODIFIED_SINCE'] = '' 
+        qs = environ.get('QUERY_STRING', '')
+        environ[DELIVERANCE_BASE_URL] = construct_url(environ, with_path_info=False, with_query_string=False)
+        environ[DELIVERANCE_CACHE] = {} 
+        notheme = 'notheme' in qs
+        if notheme:
+            return self.app(environ, start_response)
+        
+        # unsupported 
+        if 'HTTP_ACCEPT_ENCODING' in environ:
+            environ['HTTP_ACCEPT_ENCODING'] = '' 
+        if 'HTTP_IF_MATCH' in environ: 
+            environ['HTTP_IF_MATCH'] = '' 
+        if 'HTTP_IF_UNMODIFIED_SINCE' in environ: 
+            environ['HTTP_IF_UNMODIFIED_SINCE'] = '' 
             
-            status, headers, body = self.rebuild_check(environ, start_response)
+        status, headers, body = self.rebuild_check(environ, start_response)
 
-            # non-html responses, or rebuild is not necessary: bail out 
-            if status is None:
-                return body
+        # non-html responses, or rebuild is not necessary: bail out 
+        if status is None:
+            return body
 
-            # perform actual themeing 
-            body = self.filter_body(environ, body)
+        # perform actual themeing 
+        body = self.filter_body(environ, body)
 
-            replace_header(headers, 'content-length', str(len(body)))
-            replace_header(headers, 'content-type', 'text/html; charset=utf-8')
+        replace_header(headers, 'content-length', str(len(body)))
+        replace_header(headers, 'content-type', 'text/html; charset=utf-8')
 
-            cache_utils.merge_cache_headers(environ, 
-                                            environ[DELIVERANCE_CACHE], 
-                                            headers)
+        cache_utils.merge_cache_headers(environ, 
+                                        environ[DELIVERANCE_CACHE], 
+                                        headers)
 
-            start_response(status, headers)
-            return [body]
+        start_response(status, headers)
+        return [body]
         
-        except DeliveranceError, message:            
-            stack = StringIO()
-            traceback.print_exception(sys.exc_info()[0],
-                                      sys.exc_info()[1],
-                                      sys.exc_info()[2],
-                                      file=stack)
-            status = "500 Internal Server Error"
-            headers = [('Content-type','text/html')]
-            start_response(status,headers)
-            errpage = DELIVERANCE_ERROR_PAGE % (message,stack.getvalue())
-            return [ errpage ]
-
     def should_intercept(self, status, headers):
         """
         returns true if the status and headers given