From: Karl O. Pinc <kop@karlpinc.com>
Date: Thu, 3 Jun 2021 16:13:36 +0000 (-0500)
Subject: Consolidate exception handling
X-Git-Url: https://papio.biology.duke.edu/gitweb/?a=commitdiff_plain;h=6138d49ff41cc1f948ff8ff77e2f3d30376948f9;p=pgwui_core

Consolidate exception handling
---

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)