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

Sat Apr 12 10:58:09 CEST 2008

Author: wiggy
Date: Sat Apr 12 10:58:07 2008
New Revision: 53711

Modified:
   z3/deliverance/trunk/deliverance/fixuplinks.py
   z3/deliverance/trunk/deliverance/serializers.py
   z3/deliverance/trunk/deliverance/wsgimiddleware.py
Log:
Pass environ to the serializer so they can make serialization decisions based on the environment

Modified: z3/deliverance/trunk/deliverance/fixuplinks.py
==============================================================================

--- z3/deliverance/trunk/deliverance/fixuplinks.py	(original)
+++ z3/deliverance/trunk/deliverance/fixuplinks.py	Sat Apr 12 10:58:07 2008
@@ -15,7 +15,7 @@
     doc = decodeAndParseHTML(doc)
     fixup_links(doc, link_repl_func, remove_base_tags=remove_base_tags)
     serializer = get_serializer(environ, tostring)
-    return serializer(doc)
+    return serializer(environ, doc)
 
 def fixup_links(doc, link_repl_func,
                 remove_base_tags=True):

Modified: z3/deliverance/trunk/deliverance/serializers.py
==============================================================================
--- z3/deliverance/trunk/deliverance/serializers.py	(original)
+++ z3/deliverance/trunk/deliverance/serializers.py	Sat Apr 12 10:58:07 2008
@@ -1,12 +1,12 @@
 from lxml import etree
 from htmlserialize import tostring
 
-def HTML4(content):
+def HTML4(environ, content):
     return tostring(content,
                     doctype_pair=("-//W3C//DTD HTML 4.01 Transitional//EN",
                                   "http://www.w3.org/TR/html4/loose.dtd"))
 
-def XHTML(content):
+def XHTML(environ, content):
     return '<?xml version="1.0"?>' + \
             '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'+ \
             etree.tostring(content)

Modified: z3/deliverance/trunk/deliverance/wsgimiddleware.py
==============================================================================
--- z3/deliverance/trunk/deliverance/wsgimiddleware.py	(original)
+++ z3/deliverance/trunk/deliverance/wsgimiddleware.py	Sat Apr 12 10:58:07 2008
@@ -266,7 +266,7 @@
         """
         content = self.get_renderer(orig_environ).render(parseHTML(body))
         serializer = get_serializer(environ, self.serializer)
-        return serializer(content)
+        return serializer(environ, content)
 
 
     def rebuild_check(self, environ, start_response): 
