Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

merged.

--HG--
branch : trunk
  • Loading branch information...
commit 3b336c88f8cbe60f84a28f55085f833fb7d0d72c 2 parents eaa1d64 + 619eeed
@mitsuhiko authored
View
3  CHANGES
@@ -21,6 +21,9 @@ Version 2.2
- Added support for optional `scoped` modifier to blocks.
- Added support for line-comments.
- Added the `meta` module.
+- Renamed (undocumented) attribute overlay to overlayed on the environment
+ because it was clashing with a method of the same name. The new attribute
+ is called "overlayed".
Version 2.1.1
-------------
View
5 ext/django2jinja/django2jinja.py
@@ -86,7 +86,10 @@ def write_my_node(writer, node):
_newline_re = re.compile(r'(?:\r\n|\r|\n)')
-# don't ask....
+# Django stores an itertools object on the cycle node. Not only is this
+# thread unsafe but also a problem for the converter which needs the raw
+# string values passed to the constructor to create a jinja loop.cycle()
+# call from it.
_old_cycle_init = core_tags.CycleNode.__init__
def _fixed_cycle_init(self, cyclevars, variable_name=None):
self.raw_cycle_vars = map(Variable, cyclevars)
View
4 jinja2/environment.py
@@ -191,7 +191,7 @@ class Environment(object):
sandboxed = False
#: True if the environment is just an overlay
- overlay = False
+ overlayed = False
#: the environment this environment is linked to if it is an overlay
linked_to = None
@@ -303,7 +303,7 @@ def overlay(self, block_start_string=missing, block_end_string=missing,
rv = object.__new__(self.__class__)
rv.__dict__.update(self.__dict__)
- rv.overlay = True
+ rv.overlayed = True
rv.linked_to = self
for key, value in args.iteritems():
Please sign in to comment.
Something went wrong with that request. Please try again.