From d0835511e5509fb368a2193ebe4ecbbe3504b129 Mon Sep 17 00:00:00 2001 From: Elmer de Looff Date: Thu, 14 May 2020 23:17:07 +0200 Subject: [PATCH] Folds identical exception wrappers into single by combining types into a tuple. --- lib/sqlalchemy/orm/base.py | 6 +----- lib/sqlalchemy/orm/exc.py | 4 +--- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/lib/sqlalchemy/orm/base.py b/lib/sqlalchemy/orm/base.py index 4d308d26b3..4f86608d94 100644 --- a/lib/sqlalchemy/orm/base.py +++ b/lib/sqlalchemy/orm/base.py @@ -313,11 +313,7 @@ def object_state(instance): def _inspect_mapped_object(instance): try: return instance_state(instance) - # TODO: whats the py-2/3 syntax to catch two - # different kinds of exceptions at once ? - except exc.UnmappedClassError: - return None - except exc.NO_STATE: + except (exc.UnmappedClassError,) + exc.NO_STATE: return None diff --git a/lib/sqlalchemy/orm/exc.py b/lib/sqlalchemy/orm/exc.py index f061a6a56d..f5d04c2fc5 100644 --- a/lib/sqlalchemy/orm/exc.py +++ b/lib/sqlalchemy/orm/exc.py @@ -196,9 +196,7 @@ def _safe_cls_name(cls): def _default_unmapped(base, cls): try: mappers = base.manager_of_class(cls).mappers - except NO_STATE: - mappers = {} - except TypeError: + except (TypeError,) + NO_STATE: mappers = {} name = _safe_cls_name(cls) -- 2.47.3