From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Thu, 1 Mar 2007 19:10:04 +0000 (+0100)
Subject: [svn] fixed jinja trunk
X-Git-Tag: 2.0rc1~479
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cb654fbbc28b06610f695d326641bc2ec723d802;p=jinja2.git

[svn] fixed jinja trunk

--HG--
branch : trunk
---

diff --git a/jinja/datastructure.py b/jinja/datastructure.py
index a86d0ea..80d6b1b 100644
--- a/jinja/datastructure.py
+++ b/jinja/datastructure.py
@@ -100,7 +100,7 @@ class Context(object):
 
     def __init__(self, _environment_, *args, **kwargs):
         self.environment = _environment_
-        self._stack = [self.environment.globals, dict(*args, **kwargs), {}, {}]
+        self._stack = [self.environment.globals, dict(*args, **kwargs), {}]
         self.globals, self.initial, self.current = self._stack
 
         # cache object used for filters and tests
diff --git a/jinja/translators/python.py b/jinja/translators/python.py
index bb15a2d..1f8e724 100644
--- a/jinja/translators/python.py
+++ b/jinja/translators/python.py
@@ -129,8 +129,9 @@ class PythonTranslator(Translator):
 
     def process(environment, node):
         translator = PythonTranslator(environment, node)
+        filename = node.filename or '<template>'
         return Template(environment,
-                        compile(translator.translate(), node.filename, 'exec'))
+                        compile(translator.translate(), filename, 'exec'))
     process = staticmethod(process)
 
     # -- private methods