From 88d49e42148f9b42131afe7413a7abe39de501d3 Mon Sep 17 00:00:00 2001 From: Mohamed Jaazeer Date: Wed, 8 Jul 2026 15:02:20 +0530 Subject: [PATCH] Support pytest notset sentinel import change --- tests/conftest.py | 17 +++++++++++------ tests/test_cli.py | 6 +++++- 2 files changed, 16 insertions(+), 7 deletions(-) diff --git a/tests/conftest.py b/tests/conftest.py index 0414b9e22f..75875b6f44 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -4,6 +4,11 @@ import pytest from _pytest import monkeypatch +try: + from _pytest.monkeypatch import notset +except ImportError: + from _pytest.compat import NOTSET as notset + from flask import Flask from flask.globals import app_ctx as _app_ctx @@ -16,15 +21,15 @@ def _standard_os_environ(): """ mp = monkeypatch.MonkeyPatch() out = ( - (os.environ, "FLASK_ENV_FILE", monkeypatch.notset), - (os.environ, "FLASK_APP", monkeypatch.notset), - (os.environ, "FLASK_DEBUG", monkeypatch.notset), - (os.environ, "FLASK_RUN_FROM_CLI", monkeypatch.notset), - (os.environ, "WERKZEUG_RUN_MAIN", monkeypatch.notset), + (os.environ, "FLASK_ENV_FILE", notset), + (os.environ, "FLASK_APP", notset), + (os.environ, "FLASK_DEBUG", notset), + (os.environ, "FLASK_RUN_FROM_CLI", notset), + (os.environ, "WERKZEUG_RUN_MAIN", notset), ) for _, key, value in out: - if value is monkeypatch.notset: + if value is notset: mp.delenv(key, False) else: mp.setenv(key, value) diff --git a/tests/test_cli.py b/tests/test_cli.py index 2a34088bd5..a691f19af1 100644 --- a/tests/test_cli.py +++ b/tests/test_cli.py @@ -11,7 +11,11 @@ import click import pytest -from _pytest.monkeypatch import notset + +try: + from _pytest.monkeypatch import notset +except ImportError: + from _pytest.compat import NOTSET as notset from click.testing import CliRunner from flask import Blueprint