Merge "Remove code deprecated before version 1.1"

2 files changed, 2 insertions, 17 deletions

diff --git a/lib/sqlalchemy/testing/assertions.py b/lib/sqlalchemy/testing/assertions.py
index 5af29a723..61d272160 100644
--- a/lib/sqlalchemy/testing/assertions.py
+++ b/lib/sqlalchemy/testing/assertions.py
@@ -146,8 +146,8 @@ def _expect_warnings(
 
     def our_warn(msg, *arg, **kw):
         if isinstance(msg, exc_cls):
-            exception = msg
-            msg = str(exception)
+            exception = type(msg)
+            msg = str(msg)
         elif arg:
             exception = arg[0]
         else:
diff --git a/lib/sqlalchemy/testing/suite/test_reflection.py b/lib/sqlalchemy/testing/suite/test_reflection.py
index 51beb0973..708088881 100644
--- a/lib/sqlalchemy/testing/suite/test_reflection.py
+++ b/lib/sqlalchemy/testing/suite/test_reflection.py
@@ -2,7 +2,6 @@ import operator
 import re
 
 import sqlalchemy as sa
-from .. import assert_raises_message
 from .. import config
 from .. import engines
 from .. import eq_
@@ -13,7 +12,6 @@ from ..provision import temp_table_keyword_args
 from ..schema import Column
 from ..schema import Table
 from ... import event
-from ... import exc as sa_exc
 from ... import ForeignKey
 from ... import inspect
 from ... import Integer
@@ -654,19 +652,6 @@ class ComponentReflectionTest(fixtures.TablesTest):
     def test_get_pk_constraint_with_schema(self):
         self._test_get_pk_constraint(schema=testing.config.test_schema)
 
-    @testing.requires.table_reflection
-    @testing.provide_metadata
-    def test_deprecated_get_primary_keys(self):
-        meta = self.metadata
-        users = self.tables.users
-        insp = inspect(meta.bind)
-        assert_raises_message(
-            sa_exc.SADeprecationWarning,
-            r".*get_primary_keys\(\) method is deprecated",
-            insp.get_primary_keys,
-            users.name,
-        )
-
     @testing.provide_metadata
     def _test_get_foreign_keys(self, schema=None):
         meta = self.metadata