[Moin-devel] CVS: MoinMoin/parser plain.py,1.6,1.7 python.py,1.9,1.10 wiki.py,1.85,1.86 xslt.py,1.10,1.11

[J?rgen Hermann]

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

Modified Files:
	plain.py python.py wiki.py xslt.py 
Log Message:
request passing: processors and parsers


Index: plain.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/parser/plain.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** plain.py	13 Feb 2002 21:13:54 -0000	1.6
--- plain.py	17 Apr 2002 19:24:58 -0000	1.7
***************
*** 21,25 ****
      """
  
!     def __init__(self, raw, **kw):
          self.raw = raw
  
--- 21,25 ----
      """
  
!     def __init__(self, raw, request, **kw):
          self.raw = raw
  

Index: python.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/parser/python.py,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -r1.9 -r1.10
*** python.py	4 Mar 2002 19:12:57 -0000	1.9
--- python.py	17 Apr 2002 19:24:58 -0000	1.10
***************
*** 85,89 ****
      """
  
!     def __init__(self, raw, lineinfo={}, **kw):
          """ Store the source text.
          """
--- 85,89 ----
      """
  
!     def __init__(self, raw, request, lineinfo={}, **kw):
          """ Store the source text.
          """
***************
*** 167,171 ****
  
      # write colorized version to "python.html"
!     Parser(source, out = open('python.html', 'wt')).format(None, None)
  
      # load HTML page into browser
--- 167,171 ----
  
      # write colorized version to "python.html"
!     Parser(source, None, out = open('python.html', 'wt')).format(None, None)
  
      # load HTML page into browser

Index: wiki.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/parser/wiki.py,v
retrieving revision 1.85
retrieving revision 1.86
diff -C2 -r1.85 -r1.86
*** wiki.py	4 Apr 2002 19:45:49 -0000	1.85
--- wiki.py	17 Apr 2002 19:24:58 -0000	1.86
***************
*** 87,92 ****
          'smiley': string.join(map(re.escape, wikiutil.smileys.keys()), '|')}
  
!     def __init__(self, raw, **kw):
          self.raw = raw
  
          self.macro = None
--- 87,93 ----
          'smiley': string.join(map(re.escape, wikiutil.smileys.keys()), '|')}
  
!     def __init__(self, raw, request, **kw):
          self.raw = raw
+         self.request = request
  
          self.macro = None
***************
*** 236,240 ****
  
                  buff = cStringIO.StringIO()
!                 colorizer = python.Parser(open(fpath, 'r').read(), out = buff)
                  colorizer.format(self.formatter, self.form)
                  return self.formatter.preformatted(1) + \
--- 237,241 ----
  
                  buff = cStringIO.StringIO()
!                 colorizer = python.Parser(open(fpath, 'r').read(), self.request, out = buff)
                  colorizer.format(self.formatter, self.form)
                  return self.formatter.preformatted(1) + \
***************
*** 804,808 ****
                          continue
  
!                     self.processor(self.formatter, self.colorize_lines)
                      del self.colorize_lines
                      self.in_pre = 0
--- 805,809 ----
                          continue
  
!                     self.processor(self.request, self.formatter, self.colorize_lines)
                      del self.colorize_lines
                      self.in_pre = 0

Index: xslt.py
===================================================================
RCS file: /cvsroot/moin/MoinMoin/parser/xslt.py,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -r1.10 -r1.11
*** xslt.py	1 Dec 2001 20:08:42 -0000	1.10
--- xslt.py	17 Apr 2002 19:24:58 -0000	1.11
***************
*** 24,28 ****
      """
  
!     def __init__(self, raw, **kw):
          self.raw = raw
  
--- 24,28 ----
      """
  
!     def __init__(self, raw, request, **kw):
          self.raw = raw