updated FAQ for performance numbers. I guess I should remove that point anyways.

--HG--
branch : trunk

diff --git a/docs/faq.rst b/docs/faq.rst
index dc75f98308fde209b64a93cd7c62d720afbee434..3a04c2001c852f0792b3f105e93cc19f6df2f567 100644 (file)
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -18,8 +18,8 @@ How fast is it?
 We really hate benchmarks especially since they don't reflect much.  The
 performance of a template depends on many factors and you would have to
 benchmark different engines in different situations.  The benchmarks from the
-testsuite show that Jinja2 has a similar performance to `Mako`_ and is more
-than 20 times faster than Django's template engine or Genshi.  These numbers
+testsuite show that Jinja2 has a similar performance to `Mako`_ and is between
+10 and 20 times faster than Django's template engine or Genshi.  These numbers
 should be taken with tons of salt as the benchmarks that took these numbers
 only test a few performance related situations such as looping.  They are
 not a good indicator for the templates used in the average application.

diff --git a/jinja2/environment.py b/jinja2/environment.py
index 5ec8cb5f8a42e425d79169f3d103fd2d26b44d75..dc8bc254c4323232259fbdb2ca314a8d52ffe7f4 100644 (file)
--- a/jinja2/environment.py
+++ b/jinja2/environment.py
@@ -654,11 +654,10 @@ class TemplateStream(object):
         if size <= 1:
             raise ValueError('buffer size too small')
 
-        def generator():
+        def generator(next):
             buf = []
             c_size = 0
             push = buf.append
-            next = self._gen.next
 
             while 1:
                 try:
@@ -675,7 +674,7 @@ class TemplateStream(object):
                 c_size = 0
 
         self.buffered = True
-        self._next = generator().next
+        self._next = generator(self._gen.next).next
 
     def __iter__(self):
         return self