config,mark,monkeypatch: use common NOTSET from compat

Author: bluetech

src/_pytest/config/__init__.py

@@ -55,6 +55,7 @@
 from _pytest._code.code import TracebackStyle
 from _pytest._io import TerminalWriter
 from _pytest.compat import assert_never
+from _pytest.compat import NOTSET
 from _pytest.config.argparsing import Argument
 from _pytest.config.argparsing import FILE_OR_DIR
 from _pytest.config.argparsing import Parser
@@ -907,14 +908,6 @@ def _get_plugin_specs_as_list(
     )
 
 
-class Notset:
-    def __repr__(self):
-        return "<NOTSET>"
-
-
-notset = Notset()
-
-
 def _iter_rewritable_modules(package_files: Iterable[str]) -> Iterator[str]:
     """Given an iterable of file names in a source distribution, return the "names" that should
     be marked for assertion rewrite.
@@ -1840,7 +1833,7 @@ def _getconftest_pathlist(
             values.append(relroot)
         return values
 
-    def getoption(self, name: str, default: Any = notset, skip: bool = False):
+    def getoption(self, name: str, default: Any = NOTSET, skip: bool = False):
         """Return command line option value.
 
         :param name: Name of the option. You may also specify
@@ -1857,7 +1850,7 @@ def getoption(self, name: str, default: Any = notset, skip: bool = False):
                 raise AttributeError(name)
             return val
         except AttributeError as e:
-            if default is not notset:
+            if default is not NOTSET:
                 return default
             if skip:
                 import pytest

src/_pytest/config/argparsing.py

@@ -15,20 +15,13 @@
 
 from .exceptions import UsageError
 import _pytest._io
+from _pytest.compat import NOTSET
 from _pytest.deprecated import check_ispytest
 
 
 FILE_OR_DIR = "file_or_dir"
 
 
-class NotSet:
-    def __repr__(self) -> str:
-        return "<notset>"
-
-
-NOT_SET = NotSet()
-
-
 @final
 class Parser:
     """Parser for command line arguments and config-file values.
@@ -191,7 +184,7 @@ def addini(
             "string", "paths", "pathlist", "args", "linelist", "bool", "int", "float"
         ]
         | None = None,
-        default: Any = NOT_SET,
+        default: Any = NOTSET,
         *,
         aliases: Sequence[str] = (),
     ) -> None:
@@ -251,7 +244,7 @@ def addini(
         )
         if type is None:
             type = "string"
-        if default is NOT_SET:
+        if default is NOTSET:
             default = get_ini_default_for_type(type)
 
         self._inidict[name] = (help, type, default)

src/_pytest/mark/__init__.py

@@ -19,11 +19,11 @@
 from .structures import MarkDecorator
 from .structures import MarkGenerator
 from .structures import ParameterSet
+from _pytest.compat import NOTSET
 from _pytest.config import Config
 from _pytest.config import ExitCode
 from _pytest.config import hookimpl
 from _pytest.config import UsageError
-from _pytest.config.argparsing import NOT_SET
 from _pytest.config.argparsing import Parser
 from _pytest.stash import StashKey
 
@@ -247,7 +247,7 @@ def __call__(self, name: str, /, **kwargs: str | int | bool | None) -> bool:
             return False
 
         for mark in matches:  # pylint: disable=consider-using-any-or-all
-            if all(mark.kwargs.get(k, NOT_SET) == v for k, v in kwargs.items()):
+            if all(mark.kwargs.get(k, NOTSET) == v for k, v in kwargs.items()):
                 return True
         return False
 

src/_pytest/monkeypatch.py

@@ -17,6 +17,8 @@
 from typing import TypeVar
 import warnings
 
+from _pytest.compat import NOTSET
+from _pytest.compat import NotSetType
 from _pytest.deprecated import MONKEYPATCH_LEGACY_NAMESPACE_PACKAGES
 from _pytest.fixtures import fixture
 from _pytest.warning_types import PytestWarning
@@ -107,14 +109,6 @@ def derive_importpath(import_path: str, raising: bool) -> tuple[str, object]:
     return attr, target
 
 
-class Notset:
-    def __repr__(self) -> str:
-        return "<notset>"
-
-
-notset = Notset()
-
-
 @final
 class MonkeyPatch:
     """Helper to conveniently monkeypatch attributes/items/environment
@@ -167,7 +161,7 @@ def setattr(
         self,
         target: str,
         name: object,
-        value: Notset = ...,
+        value: NotSetType = ...,
         raising: bool = ...,
     ) -> None: ...
 
@@ -184,7 +178,7 @@ def setattr(
         self,
         target: str | object,
         name: object | str,
-        value: object = notset,
+        value: object = NOTSET,
         raising: bool = True,
     ) -> None:
         """
@@ -225,7 +219,7 @@ def setattr(
         __tracebackhide__ = True
         import inspect
 
-        if isinstance(value, Notset):
+        if value is NOTSET:
             if not isinstance(target, str):
                 raise TypeError(
                     "use setattr(target, name, value) or "
@@ -242,20 +236,20 @@ def setattr(
                     "import string"
                 )
 
-        oldval = getattr(target, name, notset)
-        if raising and oldval is notset:
+        oldval = getattr(target, name, NOTSET)
+        if raising and oldval is NOTSET:
             raise AttributeError(f"{target!r} has no attribute {name!r}")
 
         # avoid class descriptors like staticmethod/classmethod
         if inspect.isclass(target):
-            oldval = target.__dict__.get(name, notset)
+            oldval = target.__dict__.get(name, NOTSET)
         self._setattr.append((target, name, oldval))
         setattr(target, name, value)
 
     def delattr(
         self,
         target: object | str,
-        name: str | Notset = notset,
+        name: str | NotSetType = NOTSET,
         raising: bool = True,
     ) -> None:
         """Delete attribute ``name`` from ``target``.
@@ -270,7 +264,7 @@ def delattr(
         __tracebackhide__ = True
         import inspect
 
-        if isinstance(name, Notset):
+        if name is NOTSET:
             if not isinstance(target, str):
                 raise TypeError(
                     "use delattr(target, name) or "
@@ -283,16 +277,16 @@ def delattr(
             if raising:
                 raise AttributeError(name)
         else:
-            oldval = getattr(target, name, notset)
+            oldval = getattr(target, name, NOTSET)
             # Avoid class descriptors like staticmethod/classmethod.
             if inspect.isclass(target):
-                oldval = target.__dict__.get(name, notset)
+                oldval = target.__dict__.get(name, NOTSET)
             self._setattr.append((target, name, oldval))
             delattr(target, name)
 
     def setitem(self, dic: Mapping[K, V], name: K, value: V) -> None:
         """Set dictionary entry ``name`` to value."""
-        self._setitem.append((dic, name, dic.get(name, notset)))
+        self._setitem.append((dic, name, dic.get(name, NOTSET)))
         # Not all Mapping types support indexing, but MutableMapping doesn't support TypedDict
         dic[name] = value  # type: ignore[index]
 
@@ -306,7 +300,7 @@ def delitem(self, dic: Mapping[K, V], name: K, raising: bool = True) -> None:
             if raising:
                 raise KeyError(name)
         else:
-            self._setitem.append((dic, name, dic.get(name, notset)))
+            self._setitem.append((dic, name, dic.get(name, NOTSET)))
             # Not all Mapping types support indexing, but MutableMapping doesn't support TypedDict
             del dic[name]  # type: ignore[attr-defined]
 
@@ -410,13 +404,13 @@ def undo(self) -> None:
             Prefer to use :meth:`context() <pytest.MonkeyPatch.context>` instead.
         """
         for obj, name, value in reversed(self._setattr):
-            if value is not notset:
+            if value is not NOTSET:
                 setattr(obj, name, value)
             else:
                 delattr(obj, name)
         self._setattr[:] = []
         for dictionary, key, value in reversed(self._setitem):
-            if value is notset:
+            if value is NOTSET:
                 try:
                     # Not all Mapping types support indexing, but MutableMapping doesn't support TypedDict
                     del dictionary[key]  # type: ignore[attr-defined]