]> git.ipfire.org Git - thirdparty/jinja.git/commitdiff
projects / thirdparty / jinja.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 35e8f0a)
deprecate 'with' and 'autoescape' extensions 1243/head
authorFawziyahAlebiosu <fawziyah.alebiosu@gmail.com>
Thu, 18 Jun 2020 20:06:46 +0000 (16:06 -0400)
committerAmy <leiamy12@gmail.com>
Fri, 29 Jan 2021 21:56:47 +0000 (16:56 -0500)
CHANGES.rst patch | blob | blame | history
src/jinja2/ext.py patch | blob | blame | history
tests/test_ext.py patch | blob | blame | history
tests/test_regression.py patch | blob | blame | history

diff --git a/CHANGES.rst b/CHANGES.rst
index 03c162a41f5981ede156a78ea041b4a2302a5cfe..658d2d37f13797a203d0c20de8da1846d868b162 100644 (file)
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -21,6 +21,7 @@ Unreleased
     ``NativeEnvironment`` on Python 3.10. :issue:`1335`
 -   Add ``required`` attribute to blocks that must be overridden at some
     point, but not necessarily by the direct child :issue:`1147`
+-   Deprecate ``autoescape`` and ``with`` extensions :issue:`1203`
 
 
 Version 2.11.2
diff --git a/src/jinja2/ext.py b/src/jinja2/ext.py
index 4b89cf40a5bfcfab853f2abe82d9694cf3abd55e..73a2e7794771e102172dffe5e361555a996bc39b 100644 (file)
--- a/src/jinja2/ext.py
+++ b/src/jinja2/ext.py
@@ -1,6 +1,7 @@
 """Extension API for adding custom tags and behavior."""
 import pprint
 import re
+import warnings
 from sys import version_info
 from typing import Set
 
@@ -457,11 +458,25 @@ class LoopControlExtension(Extension):
 
 
 class WithExtension(Extension):
-    pass
+    def __init__(self, environment):
+        super().__init__(environment)
+        warnings.warn(
+            "The 'with' extension is deprecated and will be removed in"
+            " version 3.1. This is built in now.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
 
 
 class AutoEscapeExtension(Extension):
-    pass
+    def __init__(self, environment):
+        super().__init__(environment)
+        warnings.warn(
+            "The 'autoescape' extension is deprecated and will be removed in"
+            " version 3.1. This is built in now.",
+            DeprecationWarning,
+            stacklevel=2,
+        )
 
 
 class DebugExtension(Extension):
diff --git a/tests/test_ext.py b/tests/test_ext.py
index 61abdc5bd1bae7b960d107e59114329f34956699..261abd21a15299ca9da09ce9906057d92924d7b4 100644 (file)
--- a/tests/test_ext.py
+++ b/tests/test_ext.py
@@ -165,7 +165,6 @@ class StreamFilterExtension(Extension):
 class TestExtensions:
     def test_extend_late(self):
         env = Environment()
-        env.add_extension("jinja2.ext.autoescape")
         t = env.from_string('{% autoescape true %}{{ "<test>" }}{% endautoescape %}')
         assert t.render() == "&lt;test&gt;"
 
@@ -468,7 +467,7 @@ class TestNewstyleInternationalization:
         assert tmpl.render(LANGUAGE="de", apples=5) == "5 Äpfel"
 
     def test_autoescape_support(self):
-        env = Environment(extensions=["jinja2.ext.autoescape", "jinja2.ext.i18n"])
+        env = Environment(extensions=["jinja2.ext.i18n"])
         env.install_gettext_callables(
             lambda x: "<strong>Wert: %(name)s</strong>",
             lambda s, p, n: s,
@@ -482,7 +481,7 @@ class TestNewstyleInternationalization:
         assert t.render(ae=False) == "<strong>Wert: <test></strong>"
 
     def test_autoescape_macros(self):
-        env = Environment(autoescape=False, extensions=["jinja2.ext.autoescape"])
+        env = Environment(autoescape=False)
         template = (
             "{% macro m() %}<html>{% endmacro %}"
             "{% autoescape true %}{{ m() }}{% endautoescape %}"
@@ -529,7 +528,7 @@ class TestNewstyleInternationalization:
 
 class TestAutoEscape:
     def test_scoped_setting(self):
-        env = Environment(extensions=["jinja2.ext.autoescape"], autoescape=True)
+        env = Environment(autoescape=True)
         tmpl = env.from_string(
             """
             {{ "<HelloWorld>" }}
@@ -545,7 +544,7 @@ class TestAutoEscape:
             "&lt;HelloWorld&gt;",
         ]
 
-        env = Environment(extensions=["jinja2.ext.autoescape"], autoescape=False)
+        env = Environment(autoescape=False)
         tmpl = env.from_string(
             """
             {{ "<HelloWorld>" }}
@@ -562,7 +561,7 @@ class TestAutoEscape:
         ]
 
     def test_nonvolatile(self):
-        env = Environment(extensions=["jinja2.ext.autoescape"], autoescape=True)
+        env = Environment(autoescape=True)
         tmpl = env.from_string('{{ {"foo": "<test>"}|xmlattr|escape }}')
         assert tmpl.render() == ' foo="&lt;test&gt;"'
         tmpl = env.from_string(
@@ -572,7 +571,7 @@ class TestAutoEscape:
         assert tmpl.render() == " foo=&#34;&amp;lt;test&amp;gt;&#34;"
 
     def test_volatile(self):
-        env = Environment(extensions=["jinja2.ext.autoescape"], autoescape=True)
+        env = Environment(autoescape=True)
         tmpl = env.from_string(
             '{% autoescape foo %}{{ {"foo": "<test>"}'
             "|xmlattr|escape }}{% endautoescape %}"
@@ -581,7 +580,7 @@ class TestAutoEscape:
         assert tmpl.render(foo=True) == ' foo="&lt;test&gt;"'
 
     def test_scoping(self):
-        env = Environment(extensions=["jinja2.ext.autoescape"])
+        env = Environment()
         tmpl = env.from_string(
             '{% autoescape true %}{% set x = "<x>" %}{{ x }}'
             '{% endautoescape %}{{ x }}{{ "<y>" }}'
@@ -589,7 +588,7 @@ class TestAutoEscape:
         assert tmpl.render(x=1) == "&lt;x&gt;1<y>"
 
     def test_volatile_scoping(self):
-        env = Environment(extensions=["jinja2.ext.autoescape"])
+        env = Environment()
         tmplsource = """
         {% autoescape val %}
             {% macro foo(x) %}
@@ -605,11 +604,11 @@ class TestAutoEscape:
 
         # looking at the source we should see <testing> there in raw
         # (and then escaped as well)
-        env = Environment(extensions=["jinja2.ext.autoescape"])
+        env = Environment()
         pysource = env.compile(tmplsource, raw=True)
         assert "<testing>\\n" in pysource
 
-        env = Environment(extensions=["jinja2.ext.autoescape"], autoescape=True)
+        env = Environment(autoescape=True)
         pysource = env.compile(tmplsource, raw=True)
         assert "&lt;testing&gt;\\n" in pysource
 
diff --git a/tests/test_regression.py b/tests/test_regression.py
index 65ace87f5bf9e483d92e4f866bc83834186624a0..d052f43ecced1a4c5887aca6a7fc309b1bf4b321 100644 (file)
--- a/tests/test_regression.py
+++ b/tests/test_regression.py
@@ -355,9 +355,7 @@ class TestBug:
         assert t.render().strip() == "45|6"
 
     def test_macro_escaping(self):
-        env = Environment(
-            autoescape=lambda x: False, extensions=["jinja2.ext.autoescape"]
-        )
+        env = Environment(autoescape=lambda x: False)
         template = "{% macro m() %}<html>{% endmacro %}"
         template += "{% autoescape true %}{{ m() }}{% endautoescape %}"
         assert env.from_string(template).render()
Mirror of https://github.com/pallets/jinja.git