Consistently use full path to refer to psycopg error classes

diff --git a/src/pgwui_core/core.py b/src/pgwui_core/core.py
index 2e6df07e9fb8d4c699c0feba5c76a040334169a4..8d189166d27938b4cd648700d57d9138753a80b3 100644 (file)
--- a/src/pgwui_core/core.py
+++ b/src/pgwui_core/core.py
@@ -675,7 +675,7 @@ def escape_eol(string):
 
 def format_exception(ex):
     '''Return an exception formatted as suffix text for a log message.'''
-    if isinstance(ex, psycopg.DatabaseError):
+    if isinstance(ex, psycopg.errors.DatabaseError):
         diag = ex.diag
         msg = diag.message_primary
         if hasattr(diag, 'message_detail'):
@@ -753,7 +753,7 @@ class SQLCommand():
             if self.ec is None:
                 raise self._explain_encoding_error(ex)
             raise self.ec(self._explain_encoding_error(ex))
-        except psycopg.DatabaseError as ex:
+        except psycopg.errors.DatabaseError as ex:
             if self.ec is None:
                 raise ex
             raise self.ec(ex)
@@ -792,7 +792,7 @@ class LogSQLCommand(SQLCommand):
         '''
         try:
             super().execute(cur)
-        except (core_ex.UploadError, psycopg.DatabaseError) as ex:
+        except (core_ex.UploadError, psycopg.errors.DatabaseError) as ex:
             if self.log_failure:
                 self.log_failure(ex)
             raise
@@ -1646,7 +1646,7 @@ class DBConnector(object):
             errors.extend(ex.errors)
         except core_ex.PGWUIError as ex:
             errors.append(ex)
-        except psycopg.DatabaseError as ex:
+        except psycopg.errors.DatabaseError as ex:
             errors.append(core_ex.DBSetupError(ex))
         else:
             try:
@@ -1736,7 +1736,7 @@ class DBConnector(object):
                     host=registry.settings['pgwui'].get('pg_host'),
                     port=registry.settings['pgwui'].get('pg_port'),
                     **self._get_conn_kwargs(client_encoding))
-            except psycopg.OperationalError:
+            except psycopg.errors.OperationalError:
                 errors = [self.authfailerror_factory()]
                 havecreds = False
             else:
@@ -1886,7 +1886,7 @@ class NoTransactionEngine(DBConnector):
             else:
                 try:
                     processor.eat(udl)
-                except psycopg.DatabaseError as ex:
+                except psycopg.errors.DatabaseError as ex:
                     errors.append(core_ex.DBDataLineError(udl, ex))
                 except (core_ex.DataLineError, core_ex.DBError) as ex:
                     errors.append(ex)
@@ -1949,7 +1949,7 @@ class UnsafeUploadEngine(DBConnector):
             else:
                 try:
                     conn.commit()
-                except psycopg.DatabaseError as ex:
+                except psycopg.errors.DatabaseError as ex:
                     errors.append(core_ex.DBCommitError(ex))
         conn.close()
         return errors
@@ -1964,7 +1964,7 @@ class UnsafeUploadEngine(DBConnector):
         '''
         try:
             result = thunk()
-        except psycopg.DatabaseError as ex:
+        except psycopg.errors.DatabaseError as ex:
             raise core_ex.DBDataLineError(udl, ex)
         else:
             return result
@@ -1991,7 +1991,7 @@ class UnsafeUploadEngine(DBConnector):
                     'SAVEPOINT line_savepoint;')
                 try:
                     processor.eat(udl)
-                except psycopg.DatabaseError as ex:
+                except psycopg.errors.DatabaseError as ex:
                     self.cur.execute(
                         'ROLLBACK TO line_savepoint;')
                     errors.append(core_ex.DBDataLineError(udl, ex))