Merge branch '3.1.x'

diff --cc .github/workflows/tests.yaml
index 73611f878f2b3ebb9d44efda8941c076104de8e0,0a839517dfa084e8a21670750335e526ebfc1f66..9b2aae6ab0319486e04b3bd448c6f6597d5b05c9
--- 1/.github/workflows/tests.yaml
--- 2/.github/workflows/tests.yaml
+++ b/.github/workflows/tests.yaml
@@@ -32,11 -32,11 +32,11 @@@ jobs
            - {name: '3.9', python: '3.9', os: ubuntu-latest, tox: py39}
            - {name: '3.8', python: '3.8', os: ubuntu-latest, tox: py38}
            - {name: '3.7', python: '3.7', os: ubuntu-latest, tox: py37}
-           - {name: 'PyPy', python: 'pypy-3.9', os: ubuntu-latest, tox: pypy39}
+           - {name: 'PyPy', python: 'pypy-3.10', os: ubuntu-latest, tox: pypy310}
            - {name: Typing, python: '3.11', os: ubuntu-latest, tox: typing}
      steps:
 -      - uses: actions/checkout@ac593985615ec2ede58e132d2e21d2b1cbd6127c
 -      - uses: actions/setup-python@5ccb29d8773c3f3f653e1705f474dfaa8a06a912
 +      - uses: actions/checkout@8e5e7e5ab8b370d6c329ec480221332ada57f0ab
 +      - uses: actions/setup-python@bd6b4b6205c4dbad673328db7b31b7fab9e241c0
          with:
            python-version: ${{ matrix.python }}
            cache: 'pip'

diff --cc pyproject.toml
index 42bfb44173442044ad63d13d0157b6acf164abdd,0000000000000000000000000000000000000000..8ccdc139ce39a8cb87267dfa4016941164a4d138
mode 100644,000000..100644
--- 1/pyproject.toml
--- /dev/null
+++ b/pyproject.toml
@@@ -1,70 -1,0 +1,68 @@@
-     # change in Python 3.12 beta causes warning from inside pytest
-     "ignore:ast:DeprecationWarning",
 +[project]
 +name = "Jinja2"
 +description = "A very fast and expressive template engine."
 +readme = "README.rst"
 +license = {text = "BSD-3-Clause"}
 +maintainers = [{name = "Pallets", email = "contact@palletsprojects.com"}]
 +classifiers = [
 +    "Development Status :: 5 - Production/Stable",
 +    "Environment :: Web Environment",
 +    "Intended Audience :: Developers",
 +    "License :: OSI Approved :: BSD License",
 +    "Operating System :: OS Independent",
 +    "Programming Language :: Python",
 +    "Topic :: Internet :: WWW/HTTP :: Dynamic Content",
 +    "Topic :: Text Processing :: Markup :: HTML",
 +]
 +requires-python = ">=3.7"
 +dependencies = ["MarkupSafe>=2.0"]
 +dynamic = ["version"]
 +
 +[project.urls]
 +Donate = "https://palletsprojects.com/donate"
 +Documentation = "https://jinja.palletsprojects.com/"
 +Changes = "https://jinja.palletsprojects.com/changes/"
 +"Source Code" = "https://github.com/pallets/jinja/"
 +"Issue Tracker" = "https://github.com/pallets/jinja/issues/"
 +Chat = "https://discord.gg/pallets"
 +
 +[project.optional-dependencies]
 +i18n = ["Babel>=2.7"]
 +
 +[project.entry-points."babel.extractors"]
 +
 +[build-system]
 +requires = ["setuptools"]
 +build-backend = "setuptools.build_meta"
 +
 +[tool.setuptools.dynamic]
 +version = {attr = "jinja2.__version__"}
 +
 +[tool.pytest.ini_options]
 +testpaths = ["tests"]
 +filterwarnings = [
 +    "error",
 +]
 +
 +[tool.coverage.run]
 +branch = true
 +source = ["jinja2", "tests"]
 +
 +[tool.coverage.paths]
 +source = ["src", "*/site-packages"]
 +
 +[tool.mypy]
 +python_version = "3.7"
 +files = ["src/jinja2"]
 +show_error_codes = true
 +pretty = true
 +strict = true
 +local_partial_types = true
 +warn_unreachable = true
 +
 +[[tool.mypy.overrides]]
 +module = [
 +    "jinja2.defaults",
 +    "markupsafe",
 +]
 +no_implicit_reexport = false

diff --cc src/jinja2/environment.py
Simple merge

diff --cc src/jinja2/runtime.py
Simple merge

diff --cc src/jinja2/utils.py
Simple merge