Changeset 3260

Timestamp:

02/21/08 12:25:46 (11 months ago)

Author:

coderanger

Message:

Trying to adapt to new API.

Files:

• includemacro/0.11/includemacro/macros.py (modified) (6 diffs)
• includemacro/0.11/setup.py (modified) (2 diffs)

includemacro/0.11/includemacro/macros.py

@@ -4 +4 @@
-from trac.wiki.formatter import system_message
-from trac.wiki.model import WikiPage
-
+, Context
-from trac.perm import IPermissionRequestor
-
@@ -44 +44 @@
-            except KeyError:
-                pass
-    
+
-        if source_format in ('http', 'https', 'ftp'):
-            # Since I can't really do recursion checking, and because this 
@@ -60 +60 @@
-            except TracError, e:
-                return system_message('Error while previewing', str(e))
+            ctxt = Context.from_request(req)
-        elif source_format == 'wiki':
-            # XXX: Check for recursion in page includes. <NPK>
@@ -68 +69 @@
-                return system_message('Wiki page %s does not exist'%source_obj)
-            out = page.text
+            ctxt = Context.from_request(req, 'wiki', source_obj)
-        elif source_format == 'source':
-            if not req.perm.has_permission('FILE_VIEW'):
@@ -76 +78 @@
-            if dest_format is None:
-                dest_format = get_mimetype(source_obj, out)
+            ctxt = Context.from_request(req, 'source', source_obj)
-        # RFE: Add ticket: and comment: sources. <NPK>
-        # RFE: Add attachment: source. <NPK>
@@ -83 +86 @@
-        # If we have a preview format, use it
-        if dest_format:
-req
+ctxt
-        return out
-            

includemacro/0.11/setup.py

@@ -6 +6 @@
-setup(
-    name = 'TracIncludeMacro',
-1
+2
-    packages = ['includemacro'],
-    #package_data = { 'includemacro': ['templates/*.cs', 'htdocs/*.js', 'htdocs/*.css' ] },
@@ -20 +20 @@
-    ],
-    
-#install_requires = ['TracWebAdmin
+install_requires = ['Trac
-
-    entry_points = {