[Moin-devel] CVS: MoinMoin/parser wiki.py,1.82,1.83

[J?rgen Hermann]

Update of /cvsroot/moin/MoinMoin/parser
In directory usw-pr-cvs1:/tmp/cvs-serv29854/MoinMoin/parser

Modified Files:
	wiki.py 
Log Message:
Processors added


Index: wiki.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/parser/wiki.py,v
retrieving revision 1.82
retrieving revision 1.83
diff -C2 -r1.82 -r1.83
*** wiki.py	13 Mar 2002 02:49:45 -0000	1.82
--- wiki.py	16 Mar 2002 20:31:37 -0000	1.83
***************
*** 10,14 ****
  # Imports
  import cgi, os, re, string, sys
! from MoinMoin import config, user, wikimacro, wikiutil
  from MoinMoin.Page import Page
  from MoinMoin.i18n import _
--- 10,14 ----
  # Imports
  import cgi, os, re, string, sys
! from MoinMoin import config, user, wikimacro, wikiutil, util
  from MoinMoin.Page import Page
  from MoinMoin.i18n import _
***************
*** 779,804 ****
                          continue
  
!                     # !!! same code as with "inline:" handling, this needs to be unified!
!                     import cStringIO
!                     from MoinMoin.parser import python
! 
!                     buff = cStringIO.StringIO()
!                     colorizer = python.Parser(string.join(self.colorize_lines, '\n'), out = buff)
!                     colorizer.format(self.formatter, self.form)
! 
!                     sys.stdout.write(self.formatter.rawHTML(buff.getvalue()))
!                     sys.stdout.write(self.formatter.preformatted(0))
!                     self.in_pre = 0
!                     del buff
                      del self.colorize_lines
  
                      # send rest of line through regex machinery
                      line = line[endpos+3:]                    
!                 elif string.strip(line)[:2] == "#!" and string.find(line, 'python') > 0:
!                     self.in_pre = 2
!                     self.colorize_lines = []
!                     if string.strip(line) != "#!python":
!                         self.colorize_lines.append(line)
!                     continue
              else:
                  # paragraph break on empty lines
--- 779,803 ----
                          continue
  
!                     self.processor(self.formatter, self.colorize_lines)
                      del self.colorize_lines
+                     self.in_pre = 0
  
                      # send rest of line through regex machinery
                      line = line[endpos+3:]                    
!                 elif string.strip(line)[:2] == "#!":
!                     self.processor = None
!                     if string.find(line, 'python') > 0:
!                         from MoinMoin.processor.Colorize import process
!                         self.processor = process
!                     else:
!                         from MoinMoin.processor import processors
!                         processor_name = string.split(line[2:])[0]
!                         if processor_name in processors:
!                             self.processor = util.importName("MoinMoin.processor." +
!                                 processor_name, "process")
!                     if self.processor:
!                         self.in_pre = 2
!                         self.colorize_lines = [line]
!                         continue
              else:
                  # paragraph break on empty lines