Permalink
Browse files

Broke a test for 2.x :)

--HG--
branch : trunk
  • Loading branch information...
1 parent eb43b12 commit 1540b2bae3ebe4c3ef5df0cf7236104a3ada6e3c @mitsuhiko mitsuhiko committed Feb 10, 2010
Showing with 3 additions and 42 deletions.
  1. +2 −1 MANIFEST.in
  2. +0 −39 TODO
  3. +1 −2 jinja2/testsuite/debug.py
View
@@ -1,5 +1,6 @@
-include MANIFEST.in Makefile CHANGES LICENSE AUTHORS TODO ez_setup.py
+include MANIFEST.in Makefile CHANGES LICENSE AUTHORS
recursive-include docs *
+recursive-include custom_fixers *
recursive-include tests *
recursive-include ext *
recursive-include artwork *
View
39 TODO
@@ -1,39 +0,0 @@
-Todo Before Release
-===================
-
-This has to be implemented before the release:
-
-Pull Attributes Onces
----------------------
-
-Imagine the following template::
-
- {% if foo.bar %}
- {{ baz(foo.bar) }}
- {% endif %}
-
-Problem with that is that it compiles to this::
-
- if environment.subscribe(l_foo, 'bar'):
- if 0: yield None
- yield u'\n %s\n' % (
- l_baz(environment.subscribe(l_foo, 'bar')),
- )
-
-As `environment.subscribe` is more expensive then regular attribute lookups
-(it tries getitem/getattr and in sandbox mode also permissions) multiple
-lookups with the same parameters in the same scope should get local aliases.
-The result we have is that one::
-
- t1 = environment.subscribe(l_foo, 'bar')
- if t1:
- if 0: yield None
- yield u'\n %s\n' % (
- l_baz(t1),
- )
-
-However that should only happen if the attribute is accessed multiple times
-unlike locals and filters/tests which are always pulled. We're not doing that
-for filters/tests/locals as nested scopes may access it and testing is too
-complicated for the tiny performance improvement but easy for attribute
-lookups, keeping the complexity of the whole thing in mind.
@@ -38,8 +38,7 @@ def test_syntax_error(self):
# be fixed though.
self.assert_traceback_matches(lambda: env.get_template('syntaxerror.html'), r'''(?sm)
File ".*?syntaxerror.html", line 4, in (template|<module>)
- \{% endif %\}
- .*?
+ \{% endif %\}.*?
(jinja2\.exceptions\.)?TemplateSyntaxError: Encountered unknown tag 'endif'. Jinja was looking for the following tags: 'endfor' or 'else'. The innermost block that needs to be closed is 'for'.
''')

0 comments on commit 1540b2b

Please sign in to comment.