Changeset 71:ba55c8be355e

Timestamp:

02/16/07 17:19:45 (3 years ago)

Author:

rgrp

Branch:

default

convert_revision:

svn:0ead1229-0713-0410-96cd-f668dbfad531/trunk@89

Message:

Fix whitespace stuff when viewing plays.

* wsgiplain.py:

work on view method

• set strip_whitespace=False in render
• use genshi.XML to preformat text (for some reason cannot use XML() in template and has to be done here)

Files:

• src/shakespeare/wsgiplain.py (modified) (3 diffs)

src/shakespeare/wsgiplain.py

@@ -5 +5 @@
 
 import paste.request
+import genshi
 import genshi.template
 
@@ -79 +80 @@
             tfileobj = file(tpath)
             ttext = shakespeare.format.format_text(tfileobj, format)
-            import genshi.input
-            import StringIO
-            thtml = genshi.input.HTMLParser(StringIO.StringIO(ttext))
+            thtml = genshi.XML(ttext)
             texts.append(thtml)
         # would have assumed this would be 100.0/numtexts but for some reason
@@ -89 +88 @@
         template = template_loader.load('view.html')
         result = template.generate(frame_width=frame_width, texts=texts)
-        return self.response(result.render())
+        # set to not strip whitespace as o/w whitespace in pre tag gets removed
+        return self.response(result.render('html', strip_whitespace=False))