Mark Extra as deprecated

pydantic/config.py

@@ -6,8 +6,7 @@
 from typing_extensions import Literal, TypeAlias, TypedDict
 
 from ._migration import getattr_migration
-from .deprecated.config import BaseConfig
-from .deprecated.config import Extra as _Extra
+from .deprecated.config import BaseConfig, Extra
 
 if TYPE_CHECKING:
     from ._internal._generate_schema import GenerateSchema as _GenerateSchema
@@ -22,8 +21,6 @@
     Callable[[Dict[str, Any], Type[Any]], None],
 ]
 
-Extra = _Extra()
-
 ExtraValues = Literal['allow', 'ignore', 'forbid']
 
 

pydantic/deprecated/config.py

@@ -50,15 +50,22 @@ def __init_subclass__(cls, **kwargs: Any) -> None:
         return super().__init_subclass__(**kwargs)
 
 
-class Extra:
+class _ExtraMeta(type):
+    def __getattribute__(self, __name: str) -> Any:
+        # The @deprecated decorator accesses other attributes, so we only emit a warning for the expected ones
+        if __name in {'allow', 'ignore', 'forbid'}:
+            warnings.warn(
+                "`pydantic.config.Extra` is deprecated, use literal values instead (e.g. `extra='allow'`)",
+                DeprecationWarning,
+                stacklevel=2,
+            )
+        return super().__getattribute__(__name)
+
+
+@deprecated(
+    "Extra is deprecated. Use literal values instead (e.g. `extra='allow'`)", category=PydanticDeprecatedSince20
+)
+class Extra(metaclass=_ExtraMeta):
     allow: Literal['allow'] = 'allow'
     ignore: Literal['ignore'] = 'ignore'
     forbid: Literal['forbid'] = 'forbid'
-
-    def __getattribute__(self, __name: str) -> Any:
-        warnings.warn(
-            "`pydantic.config.Extra` is deprecated, use literal values instead (e.g. `extra='allow'`)",
-            DeprecationWarning,
-            stacklevel=2,
-        )
-        return super().__getattribute__(__name)