Merge "Remove code deprecated before version 1.1"

1 files changed, 0 insertions, 13 deletions

diff --git a/lib/sqlalchemy/engine/base.py b/lib/sqlalchemy/engine/base.py
index 34a4f04a9..1a5562a9b 100644
--- a/lib/sqlalchemy/engine/base.py
+++ b/lib/sqlalchemy/engine/base.py
@@ -1449,9 +1449,6 @@ class Connection(Connectable):
     ):
         exc_info = sys.exc_info()
 
-        if context and context.exception is None:
-            context.exception = e
-
         is_exit_exception = not isinstance(e, Exception)
 
         if not self._is_disconnect:
@@ -1465,9 +1462,6 @@ class Connection(Connectable):
                 )
             ) or (is_exit_exception and not self.closed)
 
-            if context:
-                context.is_disconnect = self._is_disconnect
-
         invalidate_pool_on_disconnect = not is_exit_exception
 
         if self._reentrant_error:
@@ -1519,13 +1513,6 @@ class Connection(Connectable):
             ) and not self._execution_options.get(
                 "skip_user_error_events", False
             ):
-                # legacy dbapi_error event
-                if should_wrap and context:
-                    self.dispatch.dbapi_error(
-                        self, cursor, statement, parameters, context, e
-                    )
-
-                # new handle_error event
                 ctx = ExceptionContextImpl(
                     e,
                     sqlalchemy_exception,