From: David Lord <davidism@gmail.com>
Date: Thu, 6 Feb 2020 04:39:04 +0000 (-0800)
Subject: Merge branch '2.11.x'
X-Git-Tag: 3.0.0rc1~117
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e08dadd220563609a67bc32d4d1c0abe91699231;p=thirdparty%2Fjinja.git

Merge branch '2.11.x'
---

e08dadd220563609a67bc32d4d1c0abe91699231
diff --cc tests/test_api.py
index 387fb3f1,058ec56c..0655c479
--- a/tests/test_api.py
+++ b/tests/test_api.py
@@@ -24,9 -25,7 +24,7 @@@ from jinja2.utils import environmentfun
  from jinja2.utils import evalcontextfunction
  
  
- @pytest.mark.api
- @pytest.mark.extended
 -class TestExtendedAPI(object):
 +class TestExtendedAPI:
      def test_item_and_attribute(self, env):
          from jinja2.sandbox import SandboxedEnvironment
  
@@@ -161,9 -161,7 +159,7 @@@
              t.render(total=MAX_RANGE + 1)
  
  
- @pytest.mark.api
- @pytest.mark.meta
 -class TestMeta(object):
 +class TestMeta:
      def test_find_undeclared_variables(self, env):
          ast = env.parse("{% set foo = 42 %}{{ bar + foo }}")
          x = meta.find_undeclared_variables(ast)
@@@ -216,9 -214,7 +212,7 @@@
          assert list(i) == ["foo.html", "bar.html", None]
  
  
- @pytest.mark.api
- @pytest.mark.streaming
 -class TestStreaming(object):
 +class TestStreaming:
      def test_basic_streaming(self, env):
          t = env.from_string(
              "<ul>{% for item in seq %}<li>{{ loop.index }} - {{ item }}</li>"
@@@ -259,9 -255,7 +253,7 @@@
              shutil.rmtree(tmp)
  
  
- @pytest.mark.api
- @pytest.mark.undefined
 -class TestUndefined(object):
 +class TestUndefined:
      def test_stopiteration_is_undefined(self):
          def test():
              raise StopIteration()
@@@ -396,9 -392,7 +388,7 @@@
              Undefined(obj=42, name="upper")()
  
  
- @pytest.mark.api
- @pytest.mark.lowlevel
 -class TestLowLevel(object):
 +class TestLowLevel:
      def test_custom_code_generator(self):
          class CustomCodeGenerator(CodeGenerator):
              def visit_Const(self, node, frame=None):
diff --cc tests/test_async.py
index 70f11bec,11efd849..45713d5d
--- a/tests/test_async.py
+++ b/tests/test_async.py
@@@ -130,8 -130,7 +130,7 @@@ def test_env_async()
      return env
  
  
- @pytest.mark.imports
 -class TestAsyncImports(object):
 +class TestAsyncImports:
      def test_context_imports(self, test_env_async):
          t = test_env_async.from_string('{% import "module" as m %}{{ m.test() }}')
          assert t.render(foo=42) == "[|23]"
@@@ -180,9 -179,7 +179,7 @@@
          assert not hasattr(m, "notthere")
  
  
- @pytest.mark.imports
- @pytest.mark.includes
 -class TestAsyncIncludes(object):
 +class TestAsyncIncludes:
      def test_context_include(self, test_env_async):
          t = test_env_async.from_string('{% include "header" %}')
          assert t.render(foo=42) == "[42|23]"
@@@ -279,9 -276,7 +276,7 @@@
          assert t.render().strip() == "(FOO)"
  
  
- @pytest.mark.core_tags
- @pytest.mark.for_loop
 -class TestAsyncForLoop(object):
 +class TestAsyncForLoop:
      def test_simple(self, test_env_async):
          tmpl = test_env_async.from_string("{% for item in seq %}{{ item }}{% endfor %}")
          assert tmpl.render(seq=list(range(10))) == "0123456789"
diff --cc tests/test_bytecode_cache.py
index 8979d159,c7882b1a..5b9eb0ff
--- a/tests/test_bytecode_cache.py
+++ b/tests/test_bytecode_cache.py
@@@ -13,8 -14,7 +13,7 @@@ def env(package_loader, tmp_path)
      return Environment(loader=package_loader, bytecode_cache=bytecode_cache)
  
  
- @pytest.mark.byte_code_cache
 -class TestByteCodeCache(object):
 +class TestByteCodeCache:
      def test_simple(self, env):
          tmpl = env.get_template("test.html")
          assert tmpl.render().strip() == "BAR"
diff --cc tests/test_core_tags.py
index df413480,1bd96c41..4bb95e02
--- a/tests/test_core_tags.py
+++ b/tests/test_core_tags.py
@@@ -12,9 -13,7 +12,7 @@@ def env_trim()
      return Environment(trim_blocks=True)
  
  
- @pytest.mark.core_tags
- @pytest.mark.for_loop
 -class TestForLoop(object):
 +class TestForLoop:
      def test_simple(self, env):
          tmpl = env.from_string("{% for item in seq %}{{ item }}{% endfor %}")
          assert tmpl.render(seq=list(range(10))) == "0123456789"
@@@ -300,9 -303,7 +298,7 @@@
          assert tmpl.render(x=0, seq=[1, 2, 3]) == "919293"
  
  
- @pytest.mark.core_tags
- @pytest.mark.if_condition
 -class TestIfCondition(object):
 +class TestIfCondition:
      def test_simple(self, env):
          tmpl = env.from_string("""{% if true %}...{% endif %}""")
          assert tmpl.render() == "..."
@@@ -342,9 -345,7 +338,7 @@@
          assert tmpl.render() == "1"
  
  
- @pytest.mark.core_tags
- @pytest.mark.macros
 -class TestMacros(object):
 +class TestMacros:
      def test_simple(self, env_trim):
          tmpl = env_trim.from_string(
              """\
@@@ -468,9 -469,7 +462,7 @@@
          assert tmpl.module.m(1, x=7) == "1|7|7"
  
  
- @pytest.mark.core_tags
- @pytest.mark.set
 -class TestSet(object):
 +class TestSet:
      def test_normal(self, env_trim):
          tmpl = env_trim.from_string("{% set foo = 1 %}{{ foo }}")
          assert tmpl.render() == "1"
@@@ -574,12 -573,10 +566,10 @@@
              "{{ foo }}"
          )
          assert tmpl.render() == "11"
 -        assert tmpl.module.foo == u"11"
 +        assert tmpl.module.foo == "11"
  
  
- @pytest.mark.core_tags
- @pytest.mark.with_
 -class TestWith(object):
 +class TestWith:
      def test_with(self, env):
          tmpl = env.from_string(
              """\
diff --cc tests/test_debug.py
index d3c3ac5c,284b9e91..0aec78ae
--- a/tests/test_debug.py
+++ b/tests/test_debug.py
@@@ -16,8 -17,7 +16,7 @@@ def fs_env(filesystem_loader)
      return Environment(loader=filesystem_loader)
  
  
- @pytest.mark.debug
 -class TestDebug(object):
 +class TestDebug:
      def assert_traceback_matches(self, callback, expected_tb):
          with pytest.raises(Exception) as exc_info:
              callback()
diff --cc tests/test_ext.py
index 00656b38,8e4b411e..94d20bee
--- a/tests/test_ext.py
+++ b/tests/test_ext.py
@@@ -160,8 -167,7 +160,7 @@@ class StreamFilterExtension(Extension)
              yield Token(lineno, "data", token.value[pos:])
  
  
- @pytest.mark.ext
 -class TestExtensions(object):
 +class TestExtensions:
      def test_extend_late(self):
          env = Environment()
          env.add_extension("jinja2.ext.autoescape")
@@@ -257,11 -263,10 +256,10 @@@
          out = t.render()
  
          for value in ("context", "cycler", "filters", "abs", "tests", "!="):
 -            assert "'{}'".format(value) in out
 +            assert f"'{value}'" in out
  
  
- @pytest.mark.ext
 -class TestInternationalization(object):
 +class TestInternationalization:
      def test_trans(self):
          tmpl = i18n_env.get_template("child.html")
          assert tmpl.render(LANGUAGE="de") == "<title>fehlend</title>pass auf"
@@@ -403,8 -416,7 +401,7 @@@
          ]
  
  
- @pytest.mark.ext
 -class TestScope(object):
 +class TestScope:
      def test_basic_scope_behavior(self):
          # This is what the old with statement compiled down to
          class ScopeExt(Extension):
@@@ -437,8 -449,7 +434,7 @@@
          assert tmpl.render(b=3, e=4) == "1|2|2|4|5"
  
  
- @pytest.mark.ext
 -class TestNewstyleInternationalization(object):
 +class TestNewstyleInternationalization:
      def test_trans(self):
          tmpl = newstyle_i18n_env.get_template("child.html")
          assert tmpl.render(LANGUAGE="de") == "<title>fehlend</title>pass auf"
@@@ -529,8 -540,7 +525,7 @@@
          assert t.render() == "%(foo)s"
  
  
- @pytest.mark.ext
 -class TestAutoEscape(object):
 +class TestAutoEscape:
      def test_scoped_setting(self):
          env = Environment(extensions=["jinja2.ext.autoescape"], autoescape=True)
          tmpl = env.from_string(
diff --cc tests/test_filters.py
index bda5821f,37dde44d..ab6e93d4
--- a/tests/test_filters.py
+++ b/tests/test_filters.py
@@@ -21,11 -26,10 +21,10 @@@ class Magic2
          self.value2 = value2
  
      def __str__(self):
 -        return u"(%s,%s)" % (text_type(self.value1), text_type(self.value2))
 +        return f"({self.value1},{self.value2})"
  
  
- @pytest.mark.filter
 -class TestFilter(object):
 +class TestFilter:
      def test_filter_calling(self, env):
          rv = env.call_filter("sum", [1, 2, 3])
          assert rv == 6
diff --cc tests/test_imports.py
index ca4de705,fad2edaf..7a2bd942
--- a/tests/test_imports.py
+++ b/tests/test_imports.py
@@@ -23,8 -23,7 +23,7 @@@ def test_env()
      return env
  
  
- @pytest.mark.imports
 -class TestImports(object):
 +class TestImports:
      def test_context_imports(self, test_env):
          t = test_env.from_string('{% import "module" as m %}{{ m.test() }}')
          assert t.render(foo=42) == "[|23]"
@@@ -93,16 -92,8 +92,14 @@@
          assert m.variable == 42
          assert not hasattr(m, "notthere")
  
 +    def test_not_exported(self, test_env):
 +        t = test_env.from_string("{% from 'module' import nothing %}{{ nothing() }}")
  
 -class TestIncludes(object):
 +        with pytest.raises(UndefinedError, match="does not export the requested name"):
 +            t.render()
 +
 +
- @pytest.mark.imports
- @pytest.mark.includes
 +class TestIncludes:
      def test_context_include(self, test_env):
          t = test_env.from_string('{% include "header" %}')
          assert t.render(foo=42) == "[42|23]"
diff --cc tests/test_inheritance.py
index 331427e5,e513d2e3..b95c47db
--- a/tests/test_inheritance.py
+++ b/tests/test_inheritance.py
@@@ -73,8 -74,7 +73,7 @@@ def env()
      )
  
  
- @pytest.mark.inheritance
 -class TestInheritance(object):
 +class TestInheritance:
      def test_layout(self, env):
          tmpl = env.get_template("layout")
          assert tmpl.render() == (
@@@ -232,8 -232,7 +231,7 @@@
          assert rv == ["43", "44", "45"]
  
  
- @pytest.mark.inheritance
 -class TestBugFix(object):
 +class TestBugFix:
      def test_fixed_macro_scoping_bug(self, env):
          assert (
              Environment(
diff --cc tests/test_lexnparse.py
index fabbd36e,e799acdc..d14a6ccb
--- a/tests/test_lexnparse.py
+++ b/tests/test_lexnparse.py
@@@ -12,9 -16,18 +12,7 @@@ from jinja2.lexer import TOKEN_EO
  from jinja2.lexer import TokenStream
  
  
- @pytest.mark.lexnparse
- @pytest.mark.tokenstream
 -# how does a string look like in jinja syntax?
 -if PY2:
 -
 -    def jinja_string_repr(string):
 -        return repr(string)[1:]
 -
 -
 -else:
 -    jinja_string_repr = repr
 -
 -
 -class TestTokenStream(object):
 +class TestTokenStream:
      test_tokens = [
          Token(1, TOKEN_BLOCK_BEGIN, ""),
          Token(2, TOKEN_BLOCK_END, ""),
@@@ -42,9 -55,7 +40,7 @@@
          ]
  
  
- @pytest.mark.lexnparse
- @pytest.mark.lexer
 -class TestLexer(object):
 +class TestLexer:
      def test_raw1(self, env):
          tmpl = env.from_string(
              "{% raw %}foo{% endraw %}|"
@@@ -168,9 -179,7 +164,7 @@@
              pytest.raises(TemplateSyntaxError, env.from_string, t)
  
  
- @pytest.mark.lexnparse
- @pytest.mark.parser
 -class TestParser(object):
 +class TestParser:
      def test_php_syntax(self, env):
          env = Environment("<?", "?>", "<?=", "?>", "<!--", "-->")
          tmpl = env.from_string(
@@@ -303,9 -312,7 +297,7 @@@ and bar comment #
          assert_error("{% unknown_tag %}", "Encountered unknown tag 'unknown_tag'.")
  
  
- @pytest.mark.lexnparse
- @pytest.mark.syntax
 -class TestSyntax(object):
 +class TestSyntax:
      def test_call(self, env):
          env = Environment()
          env.globals["foo"] = lambda a, b, c, e, g: a + b + c + e + g
@@@ -559,9 -567,7 +551,7 @@@
          assert tmpl.render(foo={"bar": 42}) == "42"
  
  
- @pytest.mark.lexnparse
- @pytest.mark.lstripblocks
 -class TestLstripBlocks(object):
 +class TestLstripBlocks:
      def test_lstrip(self, env):
          env = Environment(lstrip_blocks=True, trim_blocks=False)
          tmpl = env.from_string("""    {% if True %}\n    {% endif %}""")
diff --cc tests/test_loader.py
index 0ad95383,71e00b25..1e081334
--- a/tests/test_loader.py
+++ b/tests/test_loader.py
@@@ -15,8 -17,7 +15,7 @@@ from jinja2.exceptions import TemplateN
  from jinja2.loaders import split_template_path
  
  
- @pytest.mark.loaders
 -class TestLoaders(object):
 +class TestLoaders:
      def test_dict_loader(self, dict_loader):
          env = Environment(loader=dict_loader)
          tmpl = env.get_template("justdict.html")
@@@ -115,9 -116,7 +114,7 @@@
          pytest.raises(TemplateNotFound, split_template_path, "../foo")
  
  
- @pytest.mark.loaders
- @pytest.mark.filesystemloader
 -class TestFileSystemLoader(object):
 +class TestFileSystemLoader:
      searchpath = os.path.join(
          os.path.dirname(os.path.abspath(__file__)), "res", "templates"
      )
@@@ -178,12 -183,10 +175,10 @@@
          assert t.render() == expect
  
  
- @pytest.mark.loaders
- @pytest.mark.moduleloader
 -class TestModuleLoader(object):
 +class TestModuleLoader:
      archive = None
  
 -    def compile_down(self, prefix_loader, zip="deflated", py_compile=False):
 +    def compile_down(self, prefix_loader, zip="deflated"):
          log = []
          self.reg_env = Environment(loader=prefix_loader)
          if zip is not None:
diff --cc tests/test_regression.py
index 7205bde7,c5a0d680..65ace87f
--- a/tests/test_regression.py
+++ b/tests/test_regression.py
@@@ -7,10 -10,10 +7,9 @@@ from jinja2 import Templat
  from jinja2 import TemplateAssertionError
  from jinja2 import TemplateNotFound
  from jinja2 import TemplateSyntaxError
 -from jinja2._compat import text_type
  
  
- @pytest.mark.regression
 -class TestCorner(object):
 +class TestCorner:
      def test_assigned_scoping(self, env):
          t = env.from_string(
              """
@@@ -81,8 -84,7 +80,7 @@@
          assert t.render(wrapper=23) == "[1][2][3][4]23"
  
  
- @pytest.mark.regression
 -class TestBug(object):
 +class TestBug:
      def test_keyword_folding(self, env):
          env = Environment()
          env.filters["testing"] = lambda value, some: value + some
diff --cc tests/test_security.py
index c3b3f9c1,7e8974c8..44ac47ab
--- a/tests/test_security.py
+++ b/tests/test_security.py
@@@ -34,8 -37,7 +34,7 @@@ class PublicStuff
          return "PublicStuff"
  
  
- @pytest.mark.sandbox
 -class TestSandbox(object):
 +class TestSandbox:
      def test_unsafe(self, env):
          env = SandboxedEnvironment()
          pytest.raises(
@@@ -126,8 -166,7 +125,7 @@@
                  t.render(ctx)
  
  
- @pytest.mark.sandbox
 -class TestStringFormat(object):
 +class TestStringFormat:
      def test_basic_format_safety(self):
          env = SandboxedEnvironment()
          t = env.from_string('{{ "a{0.__class__}b".format(42) }}')
@@@ -149,8 -188,10 +147,7 @@@
          assert t.render() == "a42b&lt;foo&gt;"
  
  
- @pytest.mark.sandbox
 -@pytest.mark.skipif(
 -    not hasattr(str, "format_map"), reason="requires str.format_map method"
 -)
 -class TestStringFormatMap(object):
 +class TestStringFormatMap:
      def test_basic_format_safety(self):
          env = SandboxedEnvironment()
          t = env.from_string('{{ "a{x.__class__}b".format_map({"x":42}) }}')
diff --cc tests/test_tests.py
index dbf6e601,b903e3b1..d363653d
--- a/tests/test_tests.py
+++ b/tests/test_tests.py
@@@ -8,8 -9,7 +8,7 @@@ class MyDict(dict)
      pass
  
  
- @pytest.mark.test_tests
 -class TestTestsCase(object):
 +class TestTestsCase:
      def test_defined(self, env):
          tmpl = env.from_string("{{ missing is defined }}|{{ true is defined }}")
          assert tmpl.render() == "False|True"
diff --cc tests/test_utils.py
index 750002f6,b379a97a..3e24166c
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@@ -15,9 -18,7 +15,7 @@@ from jinja2.utils import select_autoesc
  from jinja2.utils import urlize
  
  
- @pytest.mark.utils
- @pytest.mark.lrucache
 -class TestLRUCache(object):
 +class TestLRUCache:
      def test_simple(self):
          d = LRUCache(3)
          d["a"] = 1
@@@ -110,11 -118,9 +108,9 @@@
          assert len(d) == 2
  
  
- @pytest.mark.utils
- @pytest.mark.helpers
 -class TestHelpers(object):
 +class TestHelpers:
      def test_object_type_repr(self):
 -        class X(object):
 +        class X:
              pass
  
          assert object_type_repr(42) == "int object"
@@@ -140,9 -146,7 +136,7 @@@
          assert not func("FOO.TXT")
  
  
- @pytest.mark.utils
- @pytest.mark.escapeUrlizeTarget
 -class TestEscapeUrlizeTarget(object):
 +class TestEscapeUrlizeTarget:
      def test_escape_urlize_target(self):
          url = "http://example.org"
          target = "<script>"
@@@ -153,9 -157,7 +147,7 @@@
          )
  
  
- @pytest.mark.utils
- @pytest.mark.loremIpsum
 -class TestLoremIpsum(object):
 +class TestLoremIpsum:
      def test_lorem_ipsum_markup(self):
          """Test that output of lorem_ipsum is Markup by default."""
          assert isinstance(generate_lorem_ipsum(), Markup)