From 6138d49ff41cc1f948ff8ff77e2f3d30376948f9 Mon Sep 17 00:00:00 2001 From: "Karl O. Pinc" Date: Thu, 3 Jun 2021 11:13:36 -0500 Subject: [PATCH] Consolidate exception handling --- src/pgwui_core/core.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/pgwui_core/core.py b/src/pgwui_core/core.py index 2b96da7..39a3418 100644 --- a/src/pgwui_core/core.py +++ b/src/pgwui_core/core.py @@ -1699,9 +1699,7 @@ class NoTransactionEngine(DBConnector): processor.eat(udl) except psycopg2.DatabaseError as ex: errors.append(core_ex.DBDataLineError(udl, ex)) - except core_ex.DataLineError as ex: - errors.append(ex) - except core_ex.DBError as ex: + except (core_ex.DataLineError, core_ex.DBError) as ex: errors.append(ex) @@ -1804,11 +1802,7 @@ class UnsafeUploadEngine(DBConnector): self.cur.execute( 'ROLLBACK TO line_savepoint;') errors.append(core_ex.DBDataLineError(udl, ex)) - except core_ex.DataLineError as ex: - self.cur.execute( - 'ROLLBACK TO line_savepoint;') - errors.append(ex) - except core_ex.DBError as ex: + except (core_ex.DataLineError, core_ex.DBError) as ex: self.cur.execute( 'ROLLBACK TO line_savepoint;') errors.append(ex) -- 2.34.1