diff options
| author | Chris McDonough <chrism@plope.com> | 2012-08-09 22:41:45 -0600 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-08-09 22:41:45 -0600 |
| commit | 351d75f83127bd3b0ae9dc9f34be840cf8ce70bc (patch) | |
| tree | 7b398f9bf6db4d64ad9d550af6bfcb03c22b9675 | |
| parent | c3a9a10324b991a42040760a04c5fb3fc5c9c864 (diff) | |
| parent | 73226aaacb52ad96f4d2e3653747b54f36fa9bc1 (diff) | |
| download | pyramid-351d75f83127bd3b0ae9dc9f34be840cf8ce70bc.tar.gz pyramid-351d75f83127bd3b0ae9dc9f34be840cf8ce70bc.tar.bz2 pyramid-351d75f83127bd3b0ae9dc9f34be840cf8ce70bc.zip | |
Merge branch 'master' of github.com:Pylons/pyramid
| -rw-r--r-- | pyramid/mako_templating.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pyramid/mako_templating.py b/pyramid/mako_templating.py index d1ee68878..16170aa0f 100644 --- a/pyramid/mako_templating.py +++ b/pyramid/mako_templating.py @@ -69,7 +69,7 @@ class PkgResourceTemplateLookup(TemplateLookup): pname, path = resolve_asset_spec(uri) srcfile = abspath_from_asset_spec(path, pname) if os.path.isfile(srcfile): - return self._load(srcfile, adjusted) + return self._load(srcfile, uri) raise exceptions.TopLevelLookupException( "Can not locate template for uri %r" % uri) return TemplateLookup.get_template(self, uri) |