changeset 721:ddc7d654fabb

fix plain text parser imports in xslt/rst parsers
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Thu, 25 May 2006 12:27:23 +0200
parents 7fc5e2c11a0e
children bf89363ffa6d 7b2e550c9660
files MoinMoin/parser/text_rst.py MoinMoin/parser/text_xslt.py
diffstat 2 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/parser/text_rst.py	Thu May 25 12:23:04 2006 +0200
+++ b/MoinMoin/parser/text_rst.py	Thu May 25 12:27:23 2006 +0200
@@ -68,11 +68,11 @@
     
         def format(self, formatter):
             _ = self.request.getText
-            from MoinMoin.parser import plain
+            from MoinMoin.parser.text import Parser as TextParser
             self.request.write(formatter.sysmsg(1) +
                                formatter.rawHTML(_('Rendering of reStructured text is not possible, ''please'' install docutils.')) +
                                formatter.sysmsg(0))
-            plain.Parser(self.raw, self.request).format(formatter)
+            TextParser(self.raw, self.request).format(formatter)
     
     # Create a pseudo docutils environment
     docutils = html4css1 = dummyUrllib2()
--- a/MoinMoin/parser/text_xslt.py	Thu May 25 12:23:04 2006 +0200
+++ b/MoinMoin/parser/text_xslt.py	Thu May 25 12:27:23 2006 +0200
@@ -42,13 +42,13 @@
         _ = self._
 
         if not self.request.cfg.allow_xslt:
-            # use plain parser if XSLT is not allowed
+            # use plain text parser if XSLT is not allowed
             # can be activated in wikiconfig.py
-            from MoinMoin.parser import plain
+            from MoinMoin.parser.text import Parser as TextParser
             self.request.write(formatter.sysmsg(1) +
                                formatter.rawHTML(_('XSLT option disabled, please look at HelpOnConfiguration.')) +
                                formatter.sysmsg(0))
-            plain.Parser(self.raw, self.request).format(formatter)
+            TextParser(self.raw, self.request).format(formatter)
             return
 
         try: