You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2013/06/03 20:56:25 UTC

[4/7] git commit: [#6325] Changing TemplateNotFound Exceptions to match Jinja FSLoader style

[#6325] Changing TemplateNotFound Exceptions to match Jinja FSLoader style

Signed-off-by: Nicholas Bollweg (Nick) <ni...@gmail.com>


Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/e9ede9ec
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/e9ede9ec
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/e9ede9ec

Branch: refs/heads/cj/6325
Commit: e9ede9ec964bbb2dcb561c789d3ddfbdede16537
Parents: 9388871
Author: Nicholas Bollweg (Nick) <ni...@gmail.com>
Authored: Fri Mar 2 17:46:25 2012 -0500
Committer: Cory Johns <cj...@slashdotmedia.com>
Committed: Mon Jun 3 18:55:48 2013 +0000

----------------------------------------------------------------------
 Allura/allura/lib/package_path_loader.py |    9 ++-------
 1 files changed, 2 insertions(+), 7 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/e9ede9ec/Allura/allura/lib/package_path_loader.py
----------------------------------------------------------------------
diff --git a/Allura/allura/lib/package_path_loader.py b/Allura/allura/lib/package_path_loader.py
index fe3f4b9..f09337d 100644
--- a/Allura/allura/lib/package_path_loader.py
+++ b/Allura/allura/lib/package_path_loader.py
@@ -208,8 +208,7 @@ class PackagePathLoader(jinja2.BaseLoader):
             path = bits[0]
             path_fragment = os.path.join(self.override_root, path)
         else:
-            raise jinja2.TemplateNotFound(
-                'Malformed template path %s' % template)
+            raise jinja2.TemplateNotFound(template)
 
         # look in all of the customized search locations...
         try:
@@ -229,9 +228,5 @@ class PackagePathLoader(jinja2.BaseLoader):
             # normally
             src = self.fs_loader.get_source(environment, filename)
         elif src is None:
-            raise jinja2.TemplateNotFound(
-                ('Template %s not found in search path ' +
-                  'and no module specified') % (
-                    path,
-                  ))
+            raise jinja2.TemplateNotFound(template)
         return src