Changeset 3615

Timestamp:

05/06/08 02:52:53 (5 months ago)

Author:

coderanger

Message:

Escape include text. New README.

Files:

• includemacro/0.11/includemacro/macros.py (modified) (3 diffs)
• includemacro/0.11/README (added)
• includemacro/0.11/setup.py (modified) (3 diffs)

includemacro/0.11/includemacro/macros.py

@@ -1 +1 @@
-# TracIncludeMacro macros
+import urllib2
+from StringIO import StringIO
+
-from trac.core import *
-from trac.wiki.macros import WikiMacroBase
@@ -6 +9 @@
-from trac.mimeview.api import Mimeview, get_mimetype, Context
-from trac.perm import IPermissionRequestor
-
-
+
+
+
-
-__all__ = ['IncludeMacro']
@@ -87 +91 @@
-        if dest_format:
-            out = Mimeview(self.env).render(ctxt, dest_format, out)
+        
+        # Escape if needed
+        if not self.config.getbool('wiki', 'render_unsafe_content', False):
+            try:
+                out = HTMLParser(StringIO(out)).parse() | HTMLSanitizer()
+            except ParseError:
+                out = escape(out)
+        
-        return out
-            

includemacro/0.11/setup.py

@@ -1 +1 @@
-#!/usr/bin/env python
-# -*- coding: iso-8859-1 -*-
+import os.path
-
-from setuptools import setup
@@ -6 +7 @@
-setup(
-    name = 'TracIncludeMacro',
-0.
+
-    packages = ['includemacro'],
-
@@ -12 +13 @@
-    author_email = 'noah@coderanger.net',
-    description = 'Include the contents of external URLs and other Trac objects in a wiki page.',
+    long_description = open(os.path.join(os.path.dirname(__file__), 'README')).read(),
-    license = 'BSD',
-
+0.11 
-    url = 'http://trac-hacks.org/wiki/IncludeMacro',
-    classifiers = [