Anonymous avatar Anonymous committed 2a277b8 Merge

merged.

Comments (0)

Files changed (3)

 - 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
 -------------

ext/django2jinja/django2jinja.py

 _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)

jinja2/environment.py

     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
 
         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():
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.