Merge pull request #11 from tino/fix_jinja_config

Swap the 'dir' and 'module' template_config values
zedshaw · Feb 26, 2013 · 7fde708 · 7fde708
2 parents 78a2011 + 5516889
commit 7fde708
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/lamson/data/prototype/config/boot.py b/lamson/data/prototype/config/boot.py
@@ -9,7 +9,7 @@
 logging.config.fileConfig("config/logging.conf")
 
 # the relay host to actually send the final message to
-settings.relay = Relay(host=settings.relay_config['host'], 
+settings.relay = Relay(host=settings.relay_config['host'],
                        port=settings.relay_config['port'], debug=1)
 
 # where to listen for incoming messages
@@ -22,6 +22,5 @@
 Router.UNDELIVERABLE_QUEUE=queue.Queue("run/undeliverable")
 
 view.LOADER = jinja2.Environment(
-    loader=jinja2.PackageLoader(settings.template_config['dir'], 
-                                settings.template_config['module']))
-
+    loader=jinja2.PackageLoader(settings.template_config['module'],
+                                settings.template_config['dir']))
diff --git a/lamson/data/prototype/config/settings.py b/lamson/data/prototype/config/settings.py
@@ -12,6 +12,7 @@
 
 router_defaults = {'host': '.+'}
 
-template_config = {'dir': 'app', 'module': 'templates'}
+# config values for jinja.PackageLoader
+template_config = {'module': 'app', 'dir': 'templates'}
 
 # the config/boot.py will turn these values into variables set in settings