Merge "Replace raise_ with raise from" into main

1 files changed, 15 insertions, 25 deletions

diff --git a/lib/sqlalchemy/engine/cursor.py b/lib/sqlalchemy/engine/cursor.py
index 0e7954ba1..794b9d2c7 100644
--- a/lib/sqlalchemy/engine/cursor.py
+++ b/lib/sqlalchemy/engine/cursor.py
@@ -606,21 +606,15 @@ class CursorResultMetaData(ResultMetaData):
 
         if raiseerr:
             if self._unpickled and isinstance(key, elements.ColumnElement):
-                util.raise_(
-                    exc.NoSuchColumnError(
-                        "Row was unpickled; lookup by ColumnElement "
-                        "is unsupported"
-                    ),
-                    replace_context=err,
-                )
+                raise exc.NoSuchColumnError(
+                    "Row was unpickled; lookup by ColumnElement "
+                    "is unsupported"
+                ) from err
             else:
-                util.raise_(
-                    exc.NoSuchColumnError(
-                        "Could not locate column in row for column '%s'"
-                        % util.string_or_unprintable(key)
-                    ),
-                    replace_context=err,
-                )
+                raise exc.NoSuchColumnError(
+                    "Could not locate column in row for column '%s'"
+                    % util.string_or_unprintable(key)
+                ) from err
         else:
             return None
 
@@ -780,10 +774,9 @@ class NoCursorDQLFetchStrategy(NoCursorFetchStrategy):
 
     def _non_result(self, result, default, err=None):
         if result.closed:
-            util.raise_(
-                exc.ResourceClosedError("This result object is closed."),
-                replace_context=err,
-            )
+            raise exc.ResourceClosedError(
+                "This result object is closed."
+            ) from err
         else:
             return default
 
@@ -1075,13 +1068,10 @@ class _NoResultMetaData(ResultMetaData):
     returns_rows = False
 
     def _we_dont_return_rows(self, err=None):
-        util.raise_(
-            exc.ResourceClosedError(
-                "This result object does not return rows. "
-                "It has been closed automatically."
-            ),
-            replace_context=err,
-        )
+        raise exc.ResourceClosedError(
+            "This result object does not return rows. "
+            "It has been closed automatically."
+        ) from err
 
     def _index_for_key(self, keys, raiseerr):
         self._we_dont_return_rows()