diff options
author | Chris Moylan <chris@chrismoylan.com> | 2011-07-05 21:42:18 -0500 |
---|---|---|
committer | Chris Moylan <chris@chrismoylan.com> | 2011-07-05 21:42:18 -0500 |
commit | f0b497ec5a0ff3b5a74115f420cd9ddcf52db830 (patch) | |
tree | 5c5662dd890cbfa494ef7ffc160fe6a64cdf9ec6 /mediagoblin/util.py | |
parent | 5e008b93f44b34078f64591f0c0ddc9205909926 (diff) | |
parent | 5ed4722de8106a512a4faacfedaae7b8eda7260b (diff) | |
download | mediagoblin-f0b497ec5a0ff3b5a74115f420cd9ddcf52db830.tar.lz mediagoblin-f0b497ec5a0ff3b5a74115f420cd9ddcf52db830.tar.xz mediagoblin-f0b497ec5a0ff3b5a74115f420cd9ddcf52db830.zip |
Merge branch 'master' into test_submission_views_365
Diffstat (limited to 'mediagoblin/util.py')
-rw-r--r-- | mediagoblin/util.py | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/mediagoblin/util.py b/mediagoblin/util.py index a20e87c4..ab219df0 100644 --- a/mediagoblin/util.py +++ b/mediagoblin/util.py @@ -64,22 +64,6 @@ def clear_test_buckets(): clear_test_template_context() -def get_jinja_loader(user_template_path=None): - """ - Set up the Jinja template loaders, possibly allowing for user - overridden templates. - - (In the future we may have another system for providing theming; - for now this is good enough.) - """ - if user_template_path: - return jinja2.ChoiceLoader( - [jinja2.FileSystemLoader(user_template_path), - jinja2.PackageLoader('mediagoblin', 'templates')]) - else: - return jinja2.PackageLoader('mediagoblin', 'templates') - - SETUP_JINJA_ENVS = {} |