diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2021-10-27 17:11:18 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@ci3.zzzcomputing.com> | 2021-10-27 17:11:18 +0000 |
| commit | 134d4953a9f3c3871aff1352c1d2c3926c9426c5 (patch) | |
| tree | b36af9e07db55b7ff9c4689e4fd182940e6d9a64 /lib/sqlalchemy/testing | |
| parent | 5a334c9a66ad83619ee6ff3dbfa5352840e76d2f (diff) | |
| parent | 0f98ead274df103a5a623baa3898580932e1c8e2 (diff) | |
| download | sqlalchemy-134d4953a9f3c3871aff1352c1d2c3926c9426c5.tar.gz | |
Merge "deprecation warnings: with_parent, aliased, from_joinpoint" into main
Diffstat (limited to 'lib/sqlalchemy/testing')
| -rw-r--r-- | lib/sqlalchemy/testing/assertions.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/testing/warnings.py | 3 |
2 files changed, 1 insertions, 4 deletions
diff --git a/lib/sqlalchemy/testing/assertions.py b/lib/sqlalchemy/testing/assertions.py index 986dbb5e9..6bf14aecd 100644 --- a/lib/sqlalchemy/testing/assertions.py +++ b/lib/sqlalchemy/testing/assertions.py @@ -86,7 +86,7 @@ def expect_deprecated(*messages, **kw): def expect_deprecated_20(*messages, **kw): - return _expect_warnings(sa_exc.RemovedIn20Warning, messages, **kw) + return _expect_warnings(sa_exc.Base20DeprecationWarning, messages, **kw) def emits_warning_on(db, *messages): diff --git a/lib/sqlalchemy/testing/warnings.py b/lib/sqlalchemy/testing/warnings.py index 64060c776..dc1286295 100644 --- a/lib/sqlalchemy/testing/warnings.py +++ b/lib/sqlalchemy/testing/warnings.py @@ -69,9 +69,6 @@ def setup_filters(): # ORM Query # r"The Query\.get\(\) method", - r"The Query\.with_parent\(\) method", - r"The Query\.with_parent\(\) method", - r"The ``aliased`` and ``from_joinpoint`` keyword arguments", r"The Query.with_polymorphic\(\) method is considered " "legacy as of the 1.x series", # |