MoinMoin: attachment:patch_if_has_import_wiki_error.patch of MacroMarket/ProgressBar

   1 *** ProgressBar_orig.py	Thu Feb 19 14:58:37 2009
   2 --- ProgressBar.py	Thu Feb 19 15:00:47 2009
   3 ***************
   4 *** 92,98 ****
   5   # Imports
   6   import time, re, StringIO
   7   from MoinMoin import version
   8 ! from MoinMoin.parser import wiki
   9   
  10   Dependencies = ["time"] # macro cannot be cached
  11   
  12 --- 92,98 ----
  13   # Imports
  14   import time, re, StringIO
  15   from MoinMoin import version
  16 ! from MoinMoin.parser import text_moin_wiki
  17   
  18   Dependencies = ["time"] # macro cannot be cached
  19   
  20 ***************
  21 *** 237,242 ****
  22       str_out = StringIO.StringIO ()      # create str to collect output
  23       request.redirect (str_out)          # divert output to that string
  24       # parse this line
  25 !     wiki.Parser (src_text, request).format (formatter)
  26       request.redirect ()                 # restore output
  27       return str_out.getvalue ()          # return what was generated
  28 --- 237,242 ----
  29       str_out = StringIO.StringIO ()      # create str to collect output
  30       request.redirect (str_out)          # divert output to that string
  31       # parse this line
  32 !     text_moin_wiki.Parser (src_text, request).format (formatter)
  33       request.redirect ()                 # restore output
  34       return str_out.getvalue ()          # return what was generated