Simplify and add checks for simple code

dbutils/pooled_db.py

@@ -146,6 +146,7 @@
 Licensed under the MIT license.
 """
 
+from contextlib import suppress
 from functools import total_ordering
 from threading import Condition
 
@@ -349,11 +350,10 @@ def unshare(self, con):
         with self._lock:
             con.unshare()
             shared = con.shared
-            if not shared:  # connection is idle,
-                try:  # so try to remove it
-                    self._shared_cache.remove(con)  # from shared cache
-                except ValueError:
-                    pass  # pool has already been closed
+            if not shared:  # connection is idle
+                # try to remove it from shared cache
+                with suppress(ValueError):  # if pool has already been closed
+                    self._shared_cache.remove(con)
         if not shared:  # connection has become idle,
             self.cache(con.con)  # so add it to the idle cache
 
@@ -374,25 +374,22 @@ def close(self):
         with self._lock:
             while self._idle_cache:  # close all idle connections
                 con = self._idle_cache.pop(0)
-                try:
+                with suppress(Exception):
                     con.close()
-                except Exception:
-                    pass
             if self._maxshared:  # close all shared connections
                 while self._shared_cache:
                     con = self._shared_cache.pop(0).con
-                    try:
+                    with suppress(Exception):
                         con.close()
-                    except Exception:
-                        pass
                     self._connections -= 1
             self._lock.notify_all()
 
     def __del__(self):
         """Delete the pool."""
-        try:
+        # builtins (including Exceptions) might not exist anymore
+        try:  # noqa: SIM105
             self.close()
-        except:  # noqa: E722 - builtin Exceptions might not exist anymore
+        except:  # noqa: E722, S110
             pass
 
     def _wait_lock(self):
@@ -437,9 +434,10 @@ def __getattr__(self, name):
 
     def __del__(self):
         """Delete the pooled connection."""
-        try:
+        # builtins (including Exceptions) might not exist anymore
+        try:  # noqa: SIM105
             self.close()
-        except:  # noqa: E722 - builtin Exceptions might not exist anymore
+        except:  # noqa: E722, S110
             pass
 
     def __enter__(self):
@@ -518,9 +516,10 @@ def __getattr__(self, name):
 
     def __del__(self):
         """Delete the pooled connection."""
-        try:
+        # builtins (including Exceptions) might not exist anymore
+        try:  # noqa: SIM105
             self.close()
-        except:  # noqa: E722 - builtin Exceptions might not exist anymore
+        except:  # noqa: E722, S110
             pass
 
     def __enter__(self):

dbutils/pooled_pg.py

@@ -112,6 +112,7 @@
 Licensed under the MIT license.
 """
 
+from contextlib import suppress
 from queue import Empty, Full, Queue
 
 from . import __version__
@@ -186,9 +187,8 @@ def __init__(
             maxcached = 0
         if maxconnections is None:
             maxconnections = 0
-        if maxcached:
-            if maxcached < mincached:
-                maxcached = mincached
+        if maxcached and maxcached < mincached:
+            maxcached = mincached
         if maxconnections:
             if maxconnections < maxcached:
                 maxconnections = maxcached
@@ -211,9 +211,8 @@ def steady_connection(self):
 
     def connection(self):
         """Get a steady, cached PostgreSQL connection from the pool."""
-        if self._connections:
-            if not self._connections.acquire(self._blocking):
-                raise TooManyConnectionsError
+        if self._connections and not self._connections.acquire(self._blocking):
+            raise TooManyConnectionsError
         try:
             con = self._cache.get_nowait()
         except Empty:
@@ -226,10 +225,8 @@ def cache(self, con):
             if self._reset == RESET_COMPLETELY:
                 con.reset()  # reset the connection completely
             elif self._reset == RESET_ALWAYS_ROLLBACK or con._transaction:
-                try:
+                with suppress(Exception):
                     con.rollback()  # rollback a possible transaction
-                except Exception:
-                    pass
             self._cache.put_nowait(con)  # and then put it back into the cache
         except Full:
             con.close()
@@ -241,20 +238,19 @@ def close(self):
         while 1:
             try:
                 con = self._cache.get_nowait()
-                try:
+                with suppress(Exception):
                     con.close()
-                except Exception:
-                    pass
                 if self._connections:
                     self._connections.release()
             except Empty:
                 break
 
     def __del__(self):
         """Delete the pool."""
-        try:
+        # builtins (including Exceptions) might not exist anymore
+        try:  # noqa: SIM105
             self.close()
-        except:  # noqa: E722 - builtin Exceptions might not exist anymore
+        except:  # noqa: E722, S110
             pass
 
 
@@ -298,9 +294,10 @@ def __getattr__(self, name):
 
     def __del__(self):
         """Delete the pooled connection."""
-        try:
+        # builtins (including Exceptions) might not exist anymore
+        try:  # noqa: SIM105
             self.close()
-        except:  # noqa: E722 - builtin Exceptions might not exist anymore
+        except:  # noqa: E722, S110
             pass
 
     def __enter__(self):