Changeset 2793

Show
Ignore:
Timestamp:
11/17/07 10:17:54 (1 year ago)
Author:
osimons
Message:

MacroPostPlugin: Follow-up to [2792]

Doing what should have preceded the last changeset - branching... Also reverting changes on 0.10.

Both 0.10 and 0.11 should be working fine now.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • macropostplugin/0.10/macropost/web_ui.py

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

  • macropostplugin/0.10/setup.py

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