Simplify control flow

Author: Cito

dbutils/pooled_pg.py

@@ -225,12 +225,11 @@ def cache(self, con):
         try:
             if self._reset == RESET_COMPLETELY:
                 con.reset()  # reset the connection completely
-            else:
-                if self._reset == RESET_ALWAYS_ROLLBACK or con._transaction:
-                    try:
-                        con.rollback()  # rollback a possible transaction
-                    except Exception:
-                        pass
+            elif self._reset == RESET_ALWAYS_ROLLBACK or con._transaction:
+                try:
+                    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()

dbutils/simple_pooled_db.py

@@ -212,4 +212,4 @@ def _threadsafe_return_connection(self, con):
         In this case, the connections always stay in the pool,
         so there is no need to do anything here.
         """
-        pass
+        # we don't need to do anything here

pyproject.toml

@@ -106,8 +106,6 @@ select = [
 ]
 # You can use `ruff rule ...` to see what these ignored rules check
 ignore = [
-  "PIE790",
-  "PLR5501",
   "PTH122",
   "PTH123",
   "S110",

tests/test_persistent_db.py

@@ -84,17 +84,16 @@ def run_queries(idx):
             db = persist.connection()
             if db != this_db:
                 res = 'error - not persistent'
+            elif q == 'ping':
+                res = 'ok - thread alive'
+            elif q == 'close':
+                db.close()
+                res = 'ok - connection closed'
             else:
-                if q == 'ping':
-                    res = 'ok - thread alive'
-                elif q == 'close':
-                    db.close()
-                    res = 'ok - connection closed'
-                else:
-                    cursor = db.cursor()
-                    cursor.execute(q)
-                    res = cursor.fetchone()
-                    cursor.close()
+                cursor = db.cursor()
+                cursor.execute(q)
+                res = cursor.fetchone()
+                cursor.close()
             res = f'{idx}({db._usage}): {res}'
             result_queue[idx].put(res, timeout=1)
         if db:

tests/test_persistent_pg.py

@@ -62,14 +62,13 @@ def run_queries(idx):
             db = persist.connection()
             if db.db != this_db:
                 res = 'error - not persistent'
+            elif q == 'ping':
+                res = 'ok - thread alive'
+            elif q == 'close':
+                db.db.close()
+                res = 'ok - connection closed'
             else:
-                if q == 'ping':
-                    res = 'ok - thread alive'
-                elif q == 'close':
-                    db.db.close()
-                    res = 'ok - connection closed'
-                else:
-                    res = db.query(q)
+                res = db.query(q)
             res = f'{idx}({db._usage}): {res}'
             result_queue[idx].put(res, timeout=1)
         if db: