[z3-checkins] r52937 - z3/deliverance/branches/urienv/deliverance

[wiggy at codespeak.net]

Author: wiggy
Date: Tue Mar 25 20:15:22 2008
New Revision: 52937

Modified:
   z3/deliverance/branches/urienv/deliverance/fixuplinks.py
   z3/deliverance/branches/urienv/deliverance/relocateresponse.py
Log:
Make the relocation logic honour the serializer setting

Modified: z3/deliverance/branches/urienv/deliverance/fixuplinks.py
==============================================================================
--- z3/deliverance/branches/urienv/deliverance/fixuplinks.py	(original)
+++ z3/deliverance/branches/urienv/deliverance/fixuplinks.py	Tue Mar 25 20:15:22 2008
@@ -4,16 +4,18 @@
 
 
 from deliverance.htmlserialize import decodeAndParseHTML, tostring
+from deliverance.utils import get_serializer
 import urlparse
 import re
 
-def fixup_text_links(doc, link_repl_func, remove_base_tags=True):
+def fixup_text_links(environ, doc, link_repl_func, remove_base_tags=True):
     """
     fixup_links(), but work on text and returns text
     """
     doc = decodeAndParseHTML(doc)
     fixup_links(doc, link_repl_func, remove_base_tags=remove_base_tags)
-    return tostring(doc)
+    serializer = get_serializer(environ, tostring)
+    return serializer(doc)
 
 def fixup_links(doc, link_repl_func,
                 remove_base_tags=True):

Modified: z3/deliverance/branches/urienv/deliverance/relocateresponse.py
==============================================================================
--- z3/deliverance/branches/urienv/deliverance/relocateresponse.py	(original)
+++ z3/deliverance/branches/urienv/deliverance/relocateresponse.py	Tue Mar 25 20:15:22 2008
@@ -35,10 +35,10 @@
         new_headers.append((name, value))
     return new_headers
 
-def relocate_content(content, base_href, old_href, new_href):
+def relocate_content(environ, content, base_href, old_href, new_href):
     def sub_link(href):
         return relocate_href(href, base_href, old_href, new_href)
-    return fixuplinks.fixup_text_links(content, sub_link)
+    return fixuplinks.fixup_text_links(environ, content, sub_link)
 
 # This catches the case of http://foo, which is equivalent to
 # http://foo/ :
@@ -84,7 +84,7 @@
             if hasattr(app_iter, 'close'):
                 app_iter.close()
         content = ''.join(written)
-        content = relocate_content(content, base_href, self.old_href, new_href)
+        content = relocate_content(environ, content, base_href, self.old_href, new_href)
         headers = stat_headers[1]
         replace_header(headers, 'content-length', str(len(content)))
         start_response(*stat_headers)