Merge branch 'master' of git+ssh://dev.laptop.org/git/projects/wikiserver

2 files changed, 13 insertions, 12 deletions

diff --git a/mwlib/parser.py b/mwlib/parser.py
index 08869c5..fd27750 100755
--- a/mwlib/parser.py
+++ b/mwlib/parser.py
@@ -601,6 +601,8 @@ class Parser(object):
             n=PreFormatted()
         else:
             n=TagNode(token.t)
+            n.starttext = ''
+            n.endtext = ''
 
         n.vlist = parseParams(self.token[1])
         
diff --git a/server.py b/server.py
index 9954da9..dfc4655 100755
--- a/server.py
+++ b/server.py
@@ -103,11 +103,12 @@ class WPWikiDB:
     def getTemplate(self, title, followRedirects=False):
         return self.getRawArticle(title)
 
-    def getExpandedArticle(self, title):
-        article_text = self.getRawArticle(title)
+    def expandArticle(self, article_text, title):
         template_expander = expander.Expander(article_text, pagename=title, wikidb=self)
-        article_text = template_expander.expandTemplates()
-        return article_text
+        return template_expander.expandTemplates()
+        
+    def getExpandedArticle(self, title):
+        return self.expandArticle(self.getRawArticle(title), title)
 
 class WPImageDB:
     """Retrieves images for mwlib."""
@@ -428,19 +429,17 @@ class WikiRequestHandler(SimpleHTTPRequestHandler):
     def get_wikitext(self, title):
         wikidb = WPWikiDB()
         article_text = wikidb.getRawArticle(title)
-        
-        # Pass ?noexpand=1 in the url to disable template expansion.
-        if self.params.get('noexpand', 0):
-            article_text = wikidb.getRawArticle(title)
-        else:
-            article_text = wikidb.getExpandedArticle(title)
 
         # Pass ?override=1 in the url to replace wikitext for testing the renderer.
         if self.params.get('override', 0):
-            override = open('override.txt', 'r')
-            article_text = unicode(override.read(), 'utf8')
+            override = codecs.open('override.txt', 'r', 'utf-8')
+            article_text = override.read()
             override.close()
 
+        # Pass ?noexpand=1 in the url to disable template expansion.
+        if not self.params.get('noexpand', 0):
+            article_text = wikidb.expandArticle(article_text, title)
+
         return article_text
     
     def write_wiki_html(self, htmlout, title, article_text):