Merge "Remove code deprecated before version 1.1"

1 files changed, 0 insertions, 47 deletions

diff --git a/lib/sqlalchemy/engine/interfaces.py b/lib/sqlalchemy/engine/interfaces.py
index 84def853f..6cf4d7dbd 100644
--- a/lib/sqlalchemy/engine/interfaces.py
+++ b/lib/sqlalchemy/engine/interfaces.py
@@ -245,19 +245,6 @@ class Dialect(object):
 
         raise NotImplementedError()
 
-    @util.deprecated(
-        "0.8",
-        "The :meth:`.Dialect.get_primary_keys` method is deprecated and "
-        "will be removed in a future release.   Please refer to the "
-        ":meth:`.Dialect.get_pk_constraint` method. ",
-    )
-    def get_primary_keys(self, connection, table_name, schema=None, **kw):
-        """Return information about primary keys in `table_name`.
-
-        """
-
-        raise NotImplementedError()
-
     def get_pk_constraint(self, connection, table_name, schema=None, **kw):
         """Return information about the primary key constraint on
         table_name`.
@@ -1094,40 +1081,6 @@ class ExecutionContext(object):
       and updates.
     """
 
-    exception = None
-    """A DBAPI-level exception that was caught when this ExecutionContext
-    attempted to execute a statement.
-
-    This attribute is meaningful only within the
-    :meth:`.ConnectionEvents.dbapi_error` event.
-
-    .. versionadded:: 0.9.7
-
-    .. seealso::
-
-        :attr:`.ExecutionContext.is_disconnect`
-
-        :meth:`.ConnectionEvents.dbapi_error`
-
-    """
-
-    is_disconnect = None
-    """Boolean flag set to True or False when a DBAPI-level exception
-    is caught when this ExecutionContext attempted to execute a statement.
-
-    This attribute is meaningful only within the
-    :meth:`.ConnectionEvents.dbapi_error` event.
-
-    .. versionadded:: 0.9.7
-
-    .. seealso::
-
-        :attr:`.ExecutionContext.exception`
-
-        :meth:`.ConnectionEvents.dbapi_error`
-
-    """
-
     def create_cursor(self):
         """Return a new cursor generated from this ExecutionContext's
         connection.