From: Armin Ronacher <armin.ronacher@active-4.com>
Date: Thu, 16 Apr 2009 21:17:43 +0000 (+0200)
Subject: Resolved conflict
X-Git-Tag: 2.2~23
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f2b59c459c3dd51892fdaa7a47082c2d7a0876a3;p=jinja2.git

Resolved conflict

--HG--
branch : trunk
---

f2b59c459c3dd51892fdaa7a47082c2d7a0876a3
diff --cc jinja2/environment.py
index 09705c1,f163ab5..9b3193a
--- a/jinja2/environment.py
+++ b/jinja2/environment.py
@@@ -482,9 -476,16 +483,14 @@@ class Environment(object)
          global _make_traceback
          if exc_info is None:
              exc_info = sys.exc_info()
+ 
+         # the debugging module is imported when it's used for the first time.
+         # we're doing a lot of stuff there and for applications that do not
+         # get any exceptions in template rendering there is no need to load
+         # all of that.
          if _make_traceback is None:
              from jinja2.debug import make_traceback as _make_traceback
 -
          traceback = _make_traceback(exc_info, source_hint)
 -
          if rendered and self.exception_formatter is not None:
              return self.exception_formatter(traceback)
          if self.exception_handler is not None: