[z3-checkins] r41947 - z3/deliverance/trunk/deliverance

[ltucker at codespeak.net]

Author: ltucker
Date: Fri Apr  6 23:16:11 2007
New Revision: 41947

Modified:
   z3/deliverance/trunk/deliverance/resource_fetcher.py
   z3/deliverance/trunk/deliverance/wsgimiddleware.py
Log:
oops. I lied, use whole inbound environment in all fetches by default for now

Modified: z3/deliverance/trunk/deliverance/resource_fetcher.py
==============================================================================
--- z3/deliverance/trunk/deliverance/resource_fetcher.py	(original)
+++ z3/deliverance/trunk/deliverance/resource_fetcher.py	Fri Apr  6 23:16:11 2007
@@ -127,13 +127,13 @@
         return body
 
 class ExternalResourceFetcher(object): 
-    def __init__(self, uri, headers_only=False): 
+    def __init__(self, in_environ, uri, headers_only=False): 
         self.uri = uri 
         
         url_chunks = urlparse.urlsplit(uri)
         loc = urlparse.urlsplit(uri) 
         
-        self.environ = {}
+        self.environ = in_environ.copy() 
         
         if headers_only: 
             self.environ['REQUEST_METHOD'] = 'HEAD'

Modified: z3/deliverance/trunk/deliverance/wsgimiddleware.py
==============================================================================
--- z3/deliverance/trunk/deliverance/wsgimiddleware.py	(original)
+++ z3/deliverance/trunk/deliverance/wsgimiddleware.py	Fri Apr  6 23:16:11 2007
@@ -368,7 +368,7 @@
             return InternalResourceFetcher(environ, uri[len(internalBaseURL):],
                                            self.app)
         else:
-            return ExternalResourceFetcher(uri)        
+            return ExternalResourceFetcher(environ, uri)        
 
 
     def get_resource_uris(self, rules):