summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2010-11-19 22:44:34 -0500
committerChris McDonough <chrism@plope.com>2010-11-19 22:44:34 -0500
commitdd53294c3342f58e0fb62b20ad61e59c1f88ac8b (patch)
treec19b46c05323cf7de5af07d4b7282c1881be68cc
parent614f00c88733b5248922e2b610c96f7c8c3ff57c (diff)
parent60e316de2a685a1662006047ee89aca4f442e7ef (diff)
downloadpyramid-dd53294c3342f58e0fb62b20ad61e59c1f88ac8b.tar.gz
pyramid-dd53294c3342f58e0fb62b20ad61e59c1f88ac8b.tar.bz2
pyramid-dd53294c3342f58e0fb62b20ad61e59c1f88ac8b.zip
Merge branch 'master' of https://github.com/BiosElement/pyramid into BiosElement-master
-rw-r--r--pyramid/mako_templating.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/pyramid/mako_templating.py b/pyramid/mako_templating.py
index e2330f3ad..6356e0db4 100644
--- a/pyramid/mako_templating.py
+++ b/pyramid/mako_templating.py
@@ -65,7 +65,7 @@ def renderer_factory(info):
module_directory = settings.get('mako.module_directory')
input_encoding = settings.get('mako.input_encoding', 'utf-8')
error_handler = settings.get('mako.error_handler', None)
- default_filters = settings.get('mako.default_filters', [])
+ default_filters = settings.get('mako.default_filters', None)
imports = settings.get('mako.imports', [])
if directories is None:
raise ConfigurationError(