summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Ruby <rubys@intertwingly.net>2010-12-31 10:20:58 -0500
committerSam Ruby <rubys@intertwingly.net>2010-12-31 10:20:58 -0500
commit3ba5c4200be0b465e34108ed5d4dcba7a1e77d3d (patch)
tree7a6f718686163e1dd0ef51a931d95688e3a24df7
parentf12cd71c0e3a2730ab0c320e71296a5a04a4b9e0 (diff)
downloadplanetpixels-3ba5c4200be0b465e34108ed5d4dcba7a1e77d3d.tar.gz
planetpixels-3ba5c4200be0b465e34108ed5d4dcba7a1e77d3d.tar.bz2
Make autoescape an option:
http://lists.planetplanet.org/archives/devel/2010-December/002189.html
-rw-r--r--docs/config.html2
-rw-r--r--docs/templates.html6
-rw-r--r--planet/config.py1
-rw-r--r--planet/shell/dj.py2
-rw-r--r--tests/data/filter/django/test.xml2
-rw-r--r--tests/test_filter_django.py12
-rw-r--r--themes/django/index.html.dj6
7 files changed, 25 insertions, 6 deletions
diff --git a/docs/config.html b/docs/config.html
index 0e5d00c..ee6cf45 100644
--- a/docs/config.html
+++ b/docs/config.html
@@ -129,6 +129,8 @@ home page</a> for more information.</dd>
<dt><ins>pubsubhubbub_feeds</ins></dt>
<dd>List of feeds to publish. Defaults to <code>atom.xml rss10.xml
rss20.xml</code>.</dd>
+<dt id="django_autoescape"><ins>django_autoescape</ins></dt>
+<dd>Control <a href="http://docs.djangoproject.com/en/dev/ref/templates/builtins/#autoescape">autoescaping</a> behavior of django templates. Defaults to <code>on</code>.</dd>
</dl>
<p>Additional options can be found in
<a href="normalization.html#overrides">normalization level overrides</a>.</p>
diff --git a/docs/templates.html b/docs/templates.html
index b9fd9c1..5549901 100644
--- a/docs/templates.html
+++ b/docs/templates.html
@@ -143,6 +143,12 @@ Item.</p>
requires at least Python 2.3.
</p>
+<p>
+ The <a href="config.html#django_autoescape">django_autoescape</a> config
+ option may be used to globally set the default value for
+ <a href="http://docs.djangoproject.com/en/dev/ref/templates/builtins/#autoescape">auto-escaping</a>.
+</p>
+
<h3>xslt</h3>
<p><a href="http://www.w3.org/TR/xslt">XSLT</a> is a paradox: it actually
makes some simple things easier to do than htmltmpl, and certainly can
diff --git a/planet/config.py b/planet/config.py
index 176ee9d..d36899f 100644
--- a/planet/config.py
+++ b/planet/config.py
@@ -116,6 +116,7 @@ def __init__():
define_planet_list('bill_of_materials')
define_planet_list('template_directories', '.')
define_planet_list('filter_directories')
+ define_planet('django_autoescape', 'on')
# template options
define_tmpl_int('days_per_page', 0)
diff --git a/planet/shell/dj.py b/planet/shell/dj.py
index 96bcd3b..d2199fc 100644
--- a/planet/shell/dj.py
+++ b/planet/shell/dj.py
@@ -32,7 +32,7 @@ def run(script, doc, output_file=None, options={}):
# set up the Django context by using the default htmltmpl
# datatype converters
- context = Context()
+ context = Context(autoescape=(config.django_autoescape()=='on'))
context.update(tmpl.template_info(doc))
context['Config'] = config.planet_options()
t = get_template(script)
diff --git a/tests/data/filter/django/test.xml b/tests/data/filter/django/test.xml
index 323a3e8..1d9882a 100644
--- a/tests/data/filter/django/test.xml
+++ b/tests/data/filter/django/test.xml
@@ -10,7 +10,7 @@
<id>urn:uuid:60a76c80-d399-11d9-b93C-0003939e0af6</id>
<entry>
- <title>&#161;Atom-Powered Robots Run Amok!</title>
+ <title type='xhtml'>&#161;Atom-Powered <b>Robots</b> Run Amok!</title>
<link href="http://example.org/2003/12/13/atom03"/>
<id>urn:uuid:1225c695-cfb8-4ebb-aaaa-80da344efa6a</id>
<updated>2003-12-13T18:30:02Z</updated>
diff --git a/tests/test_filter_django.py b/tests/test_filter_django.py
index d72800a..5be54a0 100644
--- a/tests/test_filter_django.py
+++ b/tests/test_filter_django.py
@@ -24,7 +24,17 @@ class DjangoFilterTests(unittest.TestCase):
input = feed.read(); feed.close()
results = dj.run(
os.path.realpath('tests/data/filter/django/title.html.dj'), input)
- self.assertEqual(results, u"\xa1Atom-Powered Robots Run Amok!\n")
+ self.assertEqual(results,
+ u"\xa1Atom-Powered &lt;b&gt;Robots&lt;/b&gt; Run Amok!\n")
+
+ def test_django_entry_title_autoescape_off(self):
+ config.load('tests/data/filter/django/test.ini')
+ config.parser.set('Planet', 'django_autoescape', 'off')
+ feed = open('tests/data/filter/django/test.xml')
+ input = feed.read(); feed.close()
+ results = dj.run(
+ os.path.realpath('tests/data/filter/django/title.html.dj'), input)
+ self.assertEqual(results, u"\xa1Atom-Powered <b>Robots</b> Run Amok!\n")
def test_django_config_context(self):
config.load('tests/data/filter/django/test.ini')
diff --git a/themes/django/index.html.dj b/themes/django/index.html.dj
index 632a527..637e60d 100644
--- a/themes/django/index.html.dj
+++ b/themes/django/index.html.dj
@@ -21,7 +21,7 @@
<ul>
{% for channel in Channels %}
- <li>{{ channel.title }} by {{ channel.author_name }}</li>
+ <li>{{ channel.title|safe }} by {{ channel.author_name }}</li>
{% endfor %}
</ul>
</div>
@@ -32,9 +32,9 @@
{% endifchanged %}
<div class="entry">
- {% if item.title %}<h4>{{ item.title }}</h4>{% endif %}
+ {% if item.title %}<h4>{{ item.title|safe }}</h4>{% endif %}
- {{ item.content }}
+ {{ item.content|safe }}
<p class="entry-tools">
by {{ item.channel_author }} on