Consolidate exception handling

diff --git a/src/pgwui_core/core.py b/src/pgwui_core/core.py
index 2b96da798b2cbf1cf80e7578bf65ca23adb48f5b..39a34188a6342e339bfca522f306b282780d1c8f 100644 (file)
--- 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)