unified indentation (spaces instead of tabs)

fixed non-ascii handling for creoleparser (working around a possible creoleparser-bug that causes parsing to fail for unicode text with umlauts - only utf-8 encoded strings work)
This commit is contained in:
lars 2010-04-18 01:31:48 +00:00
parent 81bf19c802
commit 34acd9bf36

View file

@ -5,17 +5,19 @@
xmlns:py="http://genshi.edgewall.org/"> xmlns:py="http://genshi.edgewall.org/">
<xi:include href="../layout.html" /> <xi:include href="../layout.html" />
<?python <?python
from creoleparser import text2html
#text can be creole-encoded, see http://www.wikicreole.org/imageServlet?page=CheatSheet%2Fcreole_cheat_sheet.png&width=340
title = "Brainstorming Online" #text can be creole-encoded, see http://www.wikicreole.org/imageServlet?page=CheatSheet%2Fcreole_cheat_sheet.png&width=340
content01 = unicode(""" title = "Brainstorming Online"
# creoleparser seems to require "utf-8" encoded strings - unicode does not work (this seems to be a bug)
content01 = """
dieser mehrzeilige Text ist HTML-escaped und kann Umlaute enthalten. dieser mehrzeilige Text ist HTML-escaped und kann Umlaute enthalten.
Falls er <Umlaute> **enthaelt**, dann muss die Datei utf8-codiert sein und der Text Falls er <Umlaute> **enthält**, dann muss die Datei utf8-codiert sein und der Text
muss in unicode verwandelt werden (unicode(foo)). muss in unicode verwandelt werden (unicode(foo)).
""") """.encode("utf-8")
from creoleparser import text2html content01 = text2html(content01, encoding=None)
?> ?>
<head> <head>
@ -23,12 +25,12 @@
</head> </head>
<body> <body>
<h1>${title}</h1> <h1>${title}</h1>
<div class="post"> <div class="post">
${Markup(text2html(content01))} ${Markup(content01)}
</div> </div>
${poll_new_small()} ${poll_new_small()}
</body> </body>
</html> </html>