the two escape implementations work the same now, updated jinja2-debug to load the...

--HG--
branch : trunk

diff --git a/jinja2-debug.py b/jinja2-debug.py
index 1e9024284c3f297e34c586e5c4a4834cf840ef27..f2fa94a04c5d24b51f1c1cd1a3a8f83c5b1327ff 100755 (executable)
--- a/jinja2-debug.py
+++ b/jinja2-debug.py
@@ -13,7 +13,7 @@ import sys
 import jinja2
 from werkzeug import script
 
-env = jinja2.Environment()
+env = jinja2.Environment(extensions=['jinja2.ext.i18n'])
 
 def shell_init_func():
     def _compile(x):

diff --git a/jinja2/compiler.py b/jinja2/compiler.py
index 6e05040c4f3e95c306fcfed7243da30662665afe..f8358356adccde48faa8d49a65f886e8220ed625 100644 (file)
--- a/jinja2/compiler.py
+++ b/jinja2/compiler.py
@@ -712,7 +712,7 @@ class CodeGenerator(NodeVisitor):
                 raise CompilerExit()
             self.outdent()
 
-        self.writeline('parent_template = environment.get_template(', node, 1)
+        self.writeline('parent_template = environment.get_template(', node)
         self.visit(node.template, frame)
         self.write(', %r)' % self.name)
         self.writeline('for name, parent_block in parent_template.'

diff --git a/jinja2/ext.py b/jinja2/ext.py
index 117c2f3b0dc0ce388170e4d9506f40b5acd6554b..119fe4edd692cc4c560ad7ff5e8cb65cadf26396 100644 (file)
--- a/jinja2/ext.py
+++ b/jinja2/ext.py
@@ -35,11 +35,10 @@ class ExtensionRegistry(type):
 
 class Extension(object):
     """Extensions can be used to add extra functionality to the Jinja template
-    system at the parser level.  This is a supported but currently
-    undocumented interface.  Custom extensions are bound to an environment but
-    may not store environment specific data on `self`.  The reason for this is
-    that an extension can be bound to another environment (for overlays) by
-    creating a copy and reassigning the `environment` attribute.
+    system at the parser level.  Custom extensions are bound to an environment
+    but may not store environment specific data on `self`.  The reason for
+    this is that an extension can be bound to another environment (for
+    overlays) by creating a copy and reassigning the `environment` attribute.
 
     As extensions are created by the environment they cannot accept any
     arguments for configuration.  One may want to work around that by using

diff --git a/jinja2/utils.py b/jinja2/utils.py
index cc6021187c219da5e4225f07fc0910da4c791fb1..313a53e20c5f0e566ef5c0582c4b3bc1c41386b3 100644 (file)
--- a/jinja2/utils.py
+++ b/jinja2/utils.py
@@ -497,7 +497,7 @@ except ImportError:
             .replace('>', '>')
             .replace('<', '&lt;')
             .replace("'", '&#39;')
-            .replace('"', '&quot;')
+            .replace('"', '&#34;')
         )
 
     def soft_unicode(s):