main commit

venv/lib/python3.12/site-packages/sqlalchemy/orm/exc.py

@@ -1,5 +1,5 @@
 # orm/exc.py
-# Copyright (C) 2005-2025 the SQLAlchemy authors and contributors
+# Copyright (C) 2005-2023 the SQLAlchemy authors and contributors
 # <see AUTHORS file>
 #
 # This module is part of SQLAlchemy and is released under
@@ -16,7 +16,6 @@ from typing import Type
 from typing import TYPE_CHECKING
 from typing import TypeVar
 
-from .util import _mapper_property_as_plain_name
 from .. import exc as sa_exc
 from .. import util
 from ..exc import MultipleResultsFound  # noqa
@@ -65,15 +64,6 @@ class FlushError(sa_exc.SQLAlchemyError):
     """A invalid condition was detected during flush()."""
 
 
-class MappedAnnotationError(sa_exc.ArgumentError):
-    """Raised when ORM annotated declarative cannot interpret the
-    expression present inside of the :class:`.Mapped` construct.
-
-    .. versionadded:: 2.0.40
-
-    """
-
-
 class UnmappedError(sa_exc.InvalidRequestError):
     """Base for exceptions that involve expected mappings not present."""
 
@@ -201,8 +191,8 @@ class LoaderStrategyException(sa_exc.InvalidRequestError):
                 % (
                     util.clsname_as_plain_name(actual_strategy_type),
                     requesting_property,
-                    _mapper_property_as_plain_name(applied_to_property_type),
-                    _mapper_property_as_plain_name(applies_to),
+                    util.clsname_as_plain_name(applied_to_property_type),
+                    util.clsname_as_plain_name(applies_to),
                 ),
             )