commit 27069d73ec6cc9bbf6ce55f6ef48bafa825508d8
author Armin Ronacher <armin.ronacher@active-4.com> Sun May 11 19:48:12 2008 +0200
committer Armin Ronacher <armin.ronacher@active-4.com> Sun May 11 19:48:12 2008 +0200
tree 20364becc181ed1b3b4d00ce745092a167a51fa1
parent d1ff858a7afd41a5cc166820f70c96f08b6d2136

fixed a bug in extension handling

--HG--
branch : trunk

jinja2/environment.py

diff --git a/jinja2/environment.py b/jinja2/environment.py
index 2fbe217..e104090 100644
--- a/jinja2/environment.py
+++ b/jinja2/environment.py
@@ -15,7 +15,6 @@
 from jinja2.optimizer import optimize
 from jinja2.compiler import generate
 from jinja2.runtime import Undefined, Context
-from jinja2.debug import translate_exception, translate_syntax_error
 from jinja2.exceptions import TemplateSyntaxError
 from jinja2.utils import import_string, LRUCache, Markup, missing, concat
 
@@ -299,6 +298,7 @@
         try:
             return Parser(self, source, filename).parse()
         except TemplateSyntaxError, e:
+            from jinja2.debug import translate_syntax_error
             exc_type, exc_value, tb = translate_syntax_error(e)
             raise exc_type, exc_value, tb
 
@@ -486,6 +486,7 @@
         try:
             return concat(self._generate(*args, **kwargs))
         except:
+            from jinja2.debug import translate_exception
             exc_type, exc_value, tb = translate_exception(sys.exc_info())
             raise exc_type, exc_value, tb
 
@@ -507,6 +508,7 @@
             for item in self._generate(*args, **kwargs):
                 yield item
         except:
+            from jinja2.debug import translate_exception
             exc_type, exc_value, tb = translate_exception(sys.exc_info())
             raise exc_type, exc_value, tb