From 939afc1e3ca7caf18214a0788a61e525490eefea Mon Sep 17 00:00:00 2001 From: Shamil Date: Thu, 17 Apr 2025 15:48:19 -0400 Subject: [PATCH] refactor: clean up unused variables in engine module Removed unused variables to improve code clarity and maintainability. This change simplifies logic in `base.py`, `default.py`, and `result.py`. No functionality was altered. Closes: #12535 Pull-request: https://github.com/sqlalchemy/sqlalchemy/pull/12535 Pull-request-sha: a9d849f3a4f3abe9aff49279c4cc81aa26aeaa9b Change-Id: If78b18dbd33733c631f8b5aad7d55261fbc4817b (cherry picked from commit d1d81f80a3764e3ebc38481fb6fd82cf6295dcf9) (cherry picked from commit ba433ff9f567b0c58f5f78c2d5cf262f9e5e9c43) --- lib/sqlalchemy/engine/base.py | 4 +--- lib/sqlalchemy/engine/default.py | 4 +--- lib/sqlalchemy/engine/result.py | 1 - 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py index cbf11acf5a..e9925eb930 100644 --- a/lib/sqlalchemy/engine/base.py +++ b/lib/sqlalchemy/engine/base.py @@ -2428,9 +2428,7 @@ class Connection(ConnectionEventsTarget, inspection.Inspectable["Inspector"]): break if sqlalchemy_exception and is_disconnect != ctx.is_disconnect: - sqlalchemy_exception.connection_invalidated = is_disconnect = ( - ctx.is_disconnect - ) + sqlalchemy_exception.connection_invalidated = ctx.is_disconnect if newraise: raise newraise.with_traceback(exc_info[2]) from e diff --git a/lib/sqlalchemy/engine/default.py b/lib/sqlalchemy/engine/default.py index f0b58b634f..69c6dc1b62 100644 --- a/lib/sqlalchemy/engine/default.py +++ b/lib/sqlalchemy/engine/default.py @@ -739,8 +739,6 @@ class DefaultDialect(Dialect): raise def do_ping(self, dbapi_connection: DBAPIConnection) -> bool: - cursor = None - cursor = dbapi_connection.cursor() try: cursor.execute(self._dialect_specific_select_one) @@ -1844,7 +1842,7 @@ class DefaultExecutionContext(ExecutionContext): if self.is_crud or self.is_text: result = self._setup_dml_or_text_result() - yp = sr = False + yp = False else: yp = exec_opt.get("yield_per", None) sr = self._is_server_side or exec_opt.get("stream_results", False) diff --git a/lib/sqlalchemy/engine/result.py b/lib/sqlalchemy/engine/result.py index ed099da05d..5d597fd5f4 100644 --- a/lib/sqlalchemy/engine/result.py +++ b/lib/sqlalchemy/engine/result.py @@ -809,7 +809,6 @@ class ResultInternal(InPlaceGenerative, Generic[_R]): "was required" ) else: - next_row = _NO_ROW # if we checked for second row then that would have # closed us :) self._soft_close(hard=True) -- 2.47.3