Cease support for Python 2 and 3.5, minor optimizations

Author: Cito

.bumpversion.cfg

@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 2.0.3
+current_version = 3.0.0
 
 [bumpversion:file:setup.py]
 search = __version__ = '{current_version}'

.github/workflows/publish_on_pypi.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: ['3.9', '2.7']
+        python: ['3.9']
 
     steps:
     - uses: actions/checkout@v2

.github/workflows/test_with_tox.yml

@@ -7,7 +7,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        python: ['2.7', '3.6', '3.7', '3.8', '3.9', '3.10']
+        python: ['3.6', '3.7', '3.8', '3.9', '3.10']
 
     steps:
       - uses: actions/checkout@v2

README.md

@@ -7,8 +7,8 @@ to a database that can be used in all kinds of multi-threaded environments.
 The suite supports DB-API 2 compliant database interfaces
 and the classic PyGreSQL interface.
 
-The current version 2.0.3 of DBUtils supports Python versions 2.7 and 3.5 to 3.10.
+The current version 3.0.0 of DBUtils supports Python versions 3.6 to 3.10.
 
-**Please have a look at the [changelog](https://webwareforpython.github.io/DBUtils/changelog.html), because there are some breaking changes in version 2.0.**
+**Please have a look at the [changelog](https://webwareforpython.github.io/DBUtils/changelog.html), because there were some breaking changes in version 2.0.**
 
 The DBUtils home page can be found at https://webwareforpython.github.io/DBUtils/

dbutils/__init__.py

@@ -5,4 +5,4 @@
     'simple_pooled_pg', 'steady_pg', 'pooled_pg', 'persistent_pg',
     'simple_pooled_db', 'steady_db', 'pooled_db', 'persistent_db']
 
-__version__ = '2.0.3'
+__version__ = '3.0.0'

dbutils/pooled_db.py

@@ -422,8 +422,7 @@ def __getattr__(self, name):
         """Proxy all members of the class."""
         if self._con:
             return getattr(self._con, name)
-        else:
-            raise InvalidConnection
+        raise InvalidConnection
 
     def __del__(self):
         """Delete the pooled connection."""
@@ -455,14 +454,12 @@ def __init__(self, con):
     def __lt__(self, other):
         if self.con._transaction == other.con._transaction:
             return self.shared < other.shared
-        else:
-            return not self.con._transaction
+        return not self.con._transaction
 
     def __le__(self, other):
         if self.con._transaction == other.con._transaction:
             return self.shared <= other.shared
-        else:
-            return not self.con._transaction
+        return not self.con._transaction
 
     def __eq__(self, other):
         return (self.con._transaction == other.con._transaction
@@ -517,8 +514,7 @@ def __getattr__(self, name):
         """Proxy all members of the class."""
         if self._con:
             return getattr(self._con, name)
-        else:
-            raise InvalidConnection
+        raise InvalidConnection
 
     def __del__(self):
         """Delete the pooled connection."""

dbutils/pooled_pg.py

@@ -112,10 +112,7 @@
 Licensed under the MIT license.
 """
 
-try:
-    from Queue import Queue, Empty, Full
-except ImportError:  # Python 3
-    from queue import Queue, Empty, Full
+from queue import Queue, Empty, Full
 
 from . import __version__
 from .steady_pg import SteadyPgConnection
@@ -289,8 +286,7 @@ def __getattr__(self, name):
         """Proxy all members of the class."""
         if self._con:
             return getattr(self._con, name)
-        else:
-            raise InvalidConnection
+        raise InvalidConnection
 
     def __del__(self):
         """Delete the pooled connection."""

dbutils/simple_pooled_db.py

@@ -134,14 +134,11 @@ def __init__(self, dbapi, maxconnections, *args, **kwargs):
         if threadsafety == 0:
             raise NotSupportedError(
                 "Database module does not support any level of threading.")
-        elif threadsafety == 1:
+        if threadsafety == 1:
             # If there is no connection level safety, build
             # the pool using the synchronized queue class
             # that implements all the required locking semantics.
-            try:
-                from Queue import Queue
-            except ImportError:  # Python 3
-                from queue import Queue
+            from queue import Queue
             self._queue = Queue(maxconnections)  # create the queue
             self.connection = self._unthreadsafe_get_connection
             self.addConnection = self._unthreadsafe_add_connection
@@ -197,12 +194,12 @@ def _unthreadsafe_return_connection(self, con):
     def _threadsafe_get_connection(self):
         """Get a connection from the pool."""
         with self._lock:
-            next = self._nextConnection
-            con = PooledDBConnection(self, self._connections[next])
-            next += 1
-            if next >= len(self._connections):
-                next = 0
-            self._nextConnection = next
+            next_con = self._nextConnection
+            con = PooledDBConnection(self, self._connections[next_con])
+            next_con += 1
+            if next_con >= len(self._connections):
+                next_con = 0
+            self._nextConnection = next_con
             return con
 
     def _threadsafe_add_connection(self, con):

dbutils/simple_pooled_pg.py

@@ -118,10 +118,7 @@ def __init__(self, maxconnections, *args, **kwargs):
         # Since there is no connection level safety, we
         # build the pool using the synchronized queue class
         # that implements all the required locking semantics.
-        try:
-            from Queue import Queue
-        except ImportError:  # Python 3
-            from queue import Queue
+        from queue import Queue
         self._queue = Queue(maxconnections)
         # Establish all database connections (it would be better to
         # only establish a part of them now, and the rest on demand).

dbutils/steady_db.py

@@ -93,11 +93,6 @@
 
 from . import __version__
 
-try:
-    baseint = (int, long)
-except NameError:  # Python 3
-    baseint = int
-
 
 class SteadyDBError(Exception):
     """General SteadyDB error."""
@@ -173,10 +168,10 @@ def __init__(
             except AttributeError:
                 self._threadsafety = None
         if not callable(self._creator):
-            raise TypeError("%r is not a connection provider." % (creator,))
+            raise TypeError(f"{creator!r} is not a connection provider.")
         if maxusage is None:
             maxusage = 0
-        if not isinstance(maxusage, baseint):
+        if not isinstance(maxusage, int):
             raise TypeError("'maxusage' must be an integer value.")
         self._maxusage = maxusage
         self._setsession_sql = setsession
@@ -531,7 +526,7 @@ def __init__(self, con, *args, **kwargs):
         try:
             self._cursor = con._cursor(*args, **kwargs)
         except AttributeError:
-            raise TypeError("%r is not a SteadyDBConnection." % (con,))
+            raise TypeError(f"{con!r} is not a SteadyDBConnection.")
         self._closed = False
 
     def __enter__(self):
@@ -688,10 +683,8 @@ def __getattr__(self, name):
             if name.startswith(('execute', 'call')):
                 # make execution methods "tough"
                 return self._get_tough_method(name)
-            else:
-                return getattr(self._cursor, name)
-        else:
-            raise InvalidCursor
+            return getattr(self._cursor, name)
+        raise InvalidCursor
 
     def __del__(self):
         """Delete the steady cursor."""

dbutils/steady_pg.py

@@ -73,11 +73,6 @@
 
 from . import __version__
 
-try:
-    baseint = (int, long)
-except NameError:  # Python 3
-    baseint = int
-
 
 class SteadyPgError(Exception):
     """General SteadyPg error."""
@@ -122,7 +117,7 @@ def __init__(
         # proper initialization of the connection
         if maxusage is None:
             maxusage = 0
-        if not isinstance(maxusage, baseint):
+        if not isinstance(maxusage, int):
             raise TypeError("'maxusage' must be an integer value.")
         self._maxusage = maxusage
         self._setsession_sql = setsession
@@ -229,10 +224,7 @@ def begin(self, sql=None):
             return self._con.query(sql or 'begin')
         else:
             # use existing method if available
-            if sql:
-                return begin(sql=sql)
-            else:
-                return begin()
+            return begin(sql=sql) if sql else begin()
 
     def end(self, sql=None):
         """Commit the current transaction."""
@@ -242,10 +234,7 @@ def end(self, sql=None):
         except AttributeError:
             return self._con.query(sql or 'end')
         else:
-            if sql:
-                return end(sql=sql)
-            else:
-                return end()
+            return end(sql=sql) if sql else end()
 
     def commit(self, sql=None):
         """Commit the current transaction."""
@@ -255,10 +244,7 @@ def commit(self, sql=None):
         except AttributeError:
             return self._con.query(sql or 'commit')
         else:
-            if sql:
-                return commit(sql=sql)
-            else:
-                return commit()
+            return commit(sql=sql) if sql else commit()
 
     def rollback(self, sql=None):
         """Rollback the current transaction."""
@@ -268,10 +254,7 @@ def rollback(self, sql=None):
         except AttributeError:
             return self._con.query(sql or 'rollback')
         else:
-            if sql:
-                return rollback(sql=sql)
-            else:
-                return rollback()
+            return rollback(sql=sql) if sql else rollback()
 
     def _get_tough_method(self, method):
         """Return a "tough" version of a connection class method.
@@ -297,11 +280,10 @@ def tough_method(*args, **kwargs):
                 if transaction:  # inside a transaction
                     self._transaction = False
                     raise  # propagate the error
-                elif self._con.db.status:  # if it was not a connection problem
+                if self._con.db.status:  # if it was not a connection problem
                     raise  # then propagate the error
-                else:  # otherwise
-                    self.reset()  # reset the connection
-                    result = method(*args, **kwargs)  # and try one more time
+                self.reset()  # reset the connection
+                result = method(*args, **kwargs)  # and try one more time
             self._usage += 1
             return result
         return tough_method
@@ -317,8 +299,7 @@ def __getattr__(self, name):
                     or name.startswith('get_')):
                 attr = self._get_tough_method(attr)
             return attr
-        else:
-            raise InvalidConnection
+        raise InvalidConnection
 
     def __del__(self):
         """Delete the steady connection."""