Changeset 3606

Show
Ignore:
Timestamp:
05/05/08 15:53:17 (7 months ago)
Author:
coderanger
Message:

Port [3601] to 0.11.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • includemacro/0.11/includemacro/macros.py

    r3260 r3606  
    7777            out = node.get_content().read() 
    7878            if dest_format is None: 
    79                 dest_format = get_mimetype(source_obj, out) 
     79                dest_format = node.content_type or get_mimetype(source_obj, out) 
    8080            ctxt = Context.from_request(req, 'source', source_obj) 
    8181        # RFE: Add ticket: and comment: sources. <NPK> 
  • includemacro/0.11/setup.py

    r3416 r3606  
    66setup( 
    77    name = 'TracIncludeMacro', 
    8     version = '2.0', 
     8    version = '2.0.1', 
    99    packages = ['includemacro'], 
    10     #package_data = { 'includemacro': ['templates/*.cs', 'htdocs/*.js', 'htdocs/*.css' ] }, 
    1110 
    12     author = "Noah Kantrowitz"
    13     author_email = "noah@coderanger.net"
    14     description = "Include the contents of external URLs and other Trac objects in a wiki page."
    15     license = "BSD"
    16     keywords = "trac plugin wiki include macro"
    17     url = "http://trac-hacks.org/wiki/IncludeMacro"
     11    author = 'Noah Kantrowitz'
     12    author_email = 'noah@coderanger.net'
     13    description = 'Include the contents of external URLs and other Trac objects in a wiki page.'
     14    license = 'BSD'
     15    keywords = 'trac plugin wiki include macro'
     16    url = 'http://trac-hacks.org/wiki/IncludeMacro'
    1817    classifiers = [ 
    1918        'Framework :: Trac',