Changeset 2792

Show
Ignore:
Timestamp:
11/17/07 09:56:59 (1 year ago)
Author:
osimons
Message:

MacroPostPlugin: Now working with very latest 0.11dev

  • Needed the new resource / context APIs
  • Updated signature and return format for post_process_request()
  • Bumped version to make dependencies safer
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • macropostplugin/0.10/macropost/web_ui.py

    r1266 r2792  
    22# Copyright 2006 Noah Kantrowitz 
    33from trac.core import * 
     4from trac.mimeview.api import Context 
     5from trac.resource import Resource 
    46from trac.web.api import IRequestFilter 
    5 from trac.wiki.formatter import WikiProcessor 
     7from trac.wiki.formatter import Formatter, WikiProcessor 
    68from trac.wiki.model import WikiPage 
    79 
    …… 
    4244                    for name in matches: 
    4345                        self.log.debug('MacroPostModule: Found macro "%s"', name) 
    44                         wp = WikiProcessor(self.env, name) 
     46                        resource = Resource('wiki', name) 
     47                        context = Context.from_request(req, resource) 
     48                        wp = WikiProcessor(Formatter(self.env, context), name) 
    4549                        if wp.macro_provider is None: 
    4650                            self.log.debug('MacroPostModule: Invalid name!!! How did that happen') 
    …… 
    5357        return handler 
    5458         
    55     def post_process_request(self, req, template, content_type): 
    56         return (template, content_type) 
     59    def post_process_request(self, req, template, data, content_type): 
     60        return (template, data, content_type) 

  • macropostplugin/0.10/setup.py

    r2099 r2792  
    66setup( 
    77    name = 'TracMacroPost', 
    8     version = '0.1', 
     8    version = '0.2', 
    99    packages = ['macropost'], 
    1010    package_data={ 'macropost' : [ ] },