Changeset 6692

Timestamp:

03/13/2008 08:48:47 PM (7 months ago)

Author:

cboos

Message:

Render using a cStringIO buffer if [Genshi 804] is available, as this is more memory efficient.

The rendering done without a cStringIO can be removed once we depend on Genshi 0.5. We might want to re-add it in the future once we get rid of our memory issues, as using the cStringIO way seems to be a bit slower.

Files:

• trunk/trac/web/chrome.py (modified) (4 diffs)

trunk/trac/web/chrome.py

@@ -20 +20 @@
 import pprint
 import re
+try: 
+    from cStringIO import StringIO as cStringIO 
+except ImportError: 
+    cStringIO = StringIO 
 
 from genshi import Markup
@@ -35 +39 @@
 from trac.resource import *
 from trac.util import compat, get_reporter_id, presentation, get_pkginfo, \
-                      get_module_path, translation
+                      get_module_path, translation, arity
 from trac.util.compat import partial, set
 from trac.util.html import plaintext
@@ -683 +687 @@
 
         if method == 'text':
-            return stream.render('text')
+            if arity(stream.render) == 3:
+                # TODO: remove this when we depend on Genshi >= 0.5
+                return stream.render('text')
+            else:
+                buffer = cStringIO()
+                stream.render('text', out=buffer)
+                return buffer.getvalue()
 
         doctype = {'text/html': DocType.XHTML_STRICT}.get(content_type)
@@ -702 +712 @@
 
         try:
-            return stream.render(method, doctype=doctype)
+            if arity(stream.render) == 3:
+                # TODO: remove this when we depend on Genshi >= 0.5
+                return stream.render(method, doctype=doctype)
+            else:
+                buffer = cStringIO()
+                stream.render('xhtml', doctype=doctype, out=buffer)
+                return buffer.getvalue()
         except:
             # restore what may be needed by the error template