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

--HG--
branch : trunk

diff --git a/CHANGES b/CHANGES
index b218e87185c51fa23f3d787b611f6a2c7ed1cb90..1701f6195697ff7d8ff9c26abd8f5910b98f896f 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -20,6 +20,9 @@ Version 2.2
   *before* the loop.  (#331)
 - Added support for optional `scoped` modifier to blocks.
 - Added support for line-comments.
+- 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
 -------------

diff --git a/jinja2/environment.py b/jinja2/environment.py
index 9b3193aa9493695d8dce1feffd25c376186cad3a..569b9b38eec753934828e6d9eac738865bd58d53 100644 (file)
--- a/jinja2/environment.py
+++ b/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 @@ class Environment(object):
 
         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():