Merge pull request #51 from gusmonod/drop-2.7

Drop 2.7 support

Author: Gus Monod

comdb2/__init__.py

@@ -12,7 +12,7 @@
 """This package provides Python interfaces to Comdb2 databases.
 
 Two different Python submodules are provided for interacting with Comdb2
-databases.  Both submodules work from Python 2.7+ and from Python 3.5+.
+databases.  Both submodules work from Python 3.6.
 
 `comdb2.dbapi2` provides an interface that conforms to `the Python Database API
 Specification v2.0 <https://www.python.org/dev/peps/pep-0249/>`_.  If you're

comdb2/_about.py

@@ -1,2 +1,2 @@
 __all__ = ['__version__']
-__version__ = "1.4.1"
+__version__ = "1.5.0"

comdb2/_ccdb2.pyx

@@ -22,7 +22,6 @@ from cpython.mem cimport PyMem_Malloc, PyMem_Free
 import datetime
 
 from pytz import timezone, UTC
-import six
 
 from ._cdb2_types import Error, Effects, DatetimeUs
 from . cimport _cdb2api as lib
@@ -113,7 +112,7 @@ cdef class _ParameterValue(object):
                 self.size = 0
                 self.data = NULL
                 return
-            elif isinstance(obj, six.integer_types):
+            elif isinstance(obj, int):
                 self.type = lib.CDB2_INTEGER
                 self.owner = None
                 self.size = sizeof(long long)
@@ -167,7 +166,7 @@ cdef class _ParameterValue(object):
                 param_name,
                 exc_desc,
             )
-            six.raise_from(Error(lib.CDB2ERR_CONV_FAIL, errmsg), exc)
+            raise Error(lib.CDB2ERR_CONV_FAIL, errmsg) from exc
         else:
             errmsg = "Can't map %s value %r for parameter '%s' to a Comdb2 type" % (
                 type(obj).__name__,
@@ -248,7 +247,7 @@ cdef _column_value(lib.cdb2_hndl_tp *hndl, int col):
 
     if exc is not None:
         errmsg += _describe_exception(exc)
-        six.raise_from(Error(lib.CDB2ERR_CONV_FAIL, errmsg), exc)
+        raise Error(lib.CDB2ERR_CONV_FAIL, errmsg) from exc
     else:
         errmsg += "Unsupported column type"
         raise Error(lib.CDB2ERR_NOTSUPPORTED, errmsg)
@@ -289,7 +288,7 @@ cdef class _Cursor(object):
                 ret = self.row_class(ret)
             except Exception as e:
                 errmsg = "Instantiating row failed: " + _describe_exception(e)
-                six.raise_from(Error(lib.CDB2ERR_UNKNOWN, errmsg), e)
+                raise Error(lib.CDB2ERR_UNKNOWN, errmsg) from e
         return ret
 
 
@@ -393,7 +392,7 @@ cdef class Handle(object):
                 row_class = self._row_factory(self.column_names())
             except Exception as e:
                 errmsg = "row_factory call failed: " + _describe_exception(e)
-                six.raise_from(Error(lib.CDB2ERR_UNKNOWN, errmsg), e)
+                raise Error(lib.CDB2ERR_UNKNOWN, errmsg) from e
 
         cdef _Cursor ret = _Cursor.__new__(_Cursor)
         ret.handle = self

comdb2/_cdb2_types.py

@@ -11,7 +11,6 @@
 
 from collections import namedtuple
 from datetime import datetime
-import six
 
 __name__ = 'comdb2.cdb2'
 
@@ -36,11 +35,11 @@ class Error(RuntimeError):
             after the failed call.
     """
     def __init__(self, error_code, error_message):
-        if not(isinstance(error_message, six.text_type)):
+        if not(isinstance(error_message, str)):
             error_message = _errstr(error_message)
         self.error_code = error_code
         self.error_message = error_message
-        super(Error, self).__init__(error_code, error_message)
+        super().__init__(error_code, error_message)
 
 
 class Effects(namedtuple('Effects',
@@ -94,13 +93,13 @@ def fromdatetime(cls, dt):
                           dt.tzinfo, **kwargs)
 
     def __add__(self, other):
-        ret = super(DatetimeUs, self).__add__(other)
+        ret = super().__add__(other)
         if isinstance(ret, datetime):
             return DatetimeUs.fromdatetime(ret)
         return ret  # must be a timedelta
 
     def __sub__(self, other):
-        ret = super(DatetimeUs, self).__sub__(other)
+        ret = super().__sub__(other)
         if isinstance(ret, datetime):
             return DatetimeUs.fromdatetime(ret)
         return ret  # must be a timedelta
@@ -110,20 +109,20 @@ def __radd__(self, other):
 
     @classmethod
     def now(cls, tz=None):
-        ret = super(DatetimeUs, cls).now(tz)
+        ret = super().now(tz)
         return DatetimeUs.fromdatetime(ret)
 
     @classmethod
     def fromtimestamp(cls, timestamp, tz=None):
-        ret = super(DatetimeUs, cls).fromtimestamp(timestamp, tz)
+        ret = super().fromtimestamp(timestamp, tz)
         return DatetimeUs.fromdatetime(ret)
 
     def astimezone(self, *args, **kwargs):
-        ret = super(DatetimeUs, self).astimezone(*args, **kwargs)
+        ret = super().astimezone(*args, **kwargs)
         return DatetimeUs.fromdatetime(ret)
 
     def replace(self, *args, **kwargs):
         # Before Python 3.7, it is effectively implementation dependent whether
         # this returns a DatetimeUs or a datetime.
-        dt = super(DatetimeUs, self).replace(*args, **kwargs)
+        dt = super().replace(*args, **kwargs)
         return self.fromdatetime(dt)

comdb2/cdb2.py

@@ -112,8 +112,8 @@
 NULL           ``None``
 integer        `int`
 real           `float`
-blob           `six.binary_type` (aka `bytes` in Python 3, ``str`` in Python 2)
-text           `six.text_type` (aka `str` in Python 3, ``unicode`` in Python 2)
+blob           `bytes`
+text           `str`
 datetime       `datetime.datetime`
 datetimeus     `DatetimeUs`
 ============   ================================================================
@@ -127,7 +127,6 @@
     problems for new users.
     Make sure to carefully read :ref:`String and Blob Types` on that page.
 """
-from __future__ import absolute_import, unicode_literals
 
 from ._cdb2_types import Error, Effects, DatetimeUs
 from ._ccdb2 import Handle as CHandle
@@ -136,40 +135,40 @@
            'ERROR_CODE', 'TYPE', 'HANDLE_FLAGS']
 
 # Pull all comdb2 error codes from cdb2api.h into our namespace
-ERROR_CODE = {u'CONNECT_ERROR'         : -1,
-              u'NOTCONNECTED'          : -2,
-              u'PREPARE_ERROR'         : -3,
-              u'IO_ERROR'              : -4,
-              u'INTERNAL'              : -5,
-              u'NOSTATEMENT'           : -6,
-              u'BADCOLUMN'             : -7,
-              u'BADSTATE'              : -8,
-              u'ASYNCERR'              : -9,
-              u'INVALID_ID'            : -12,
-              u'RECORD_OUT_OF_RANGE'   : -13,
-              u'REJECTED'              : -15,
-              u'STOPPED'               : -16,
-              u'BADREQ'                : -17,
-              u'DBCREATE_FAILED'       : -18,
-              u'THREADPOOL_INTERNAL'   : -20,
-              u'READONLY'              : -21,
-              u'NOMASTER'              : -101,
-              u'UNTAGGED_DATABASE'     : -102,
-              u'CONSTRAINTS'           : -103,
-              u'DEADLOCK'              : 203,
-              u'TRAN_IO_ERROR'         : -105,
-              u'ACCESS'                : -106,
-              u'TRAN_MODE_UNSUPPORTED' : -107,
-              u'VERIFY_ERROR'          : 2,
-              u'FKEY_VIOLATION'        : 3,
-              u'NULL_CONSTRAINT'       : 4,
-              u'CONV_FAIL'             : 113,
-              u'NONKLESS'              : 114,
-              u'MALLOC'                : 115,
-              u'NOTSUPPORTED'          : 116,
-              u'DUPLICATE'             : 299,
-              u'TZNAME_FAIL'           : 401,
-              u'UNKNOWN'               : 300,
+ERROR_CODE = {'CONNECT_ERROR'         : -1,
+              'NOTCONNECTED'          : -2,
+              'PREPARE_ERROR'         : -3,
+              'IO_ERROR'              : -4,
+              'INTERNAL'              : -5,
+              'NOSTATEMENT'           : -6,
+              'BADCOLUMN'             : -7,
+              'BADSTATE'              : -8,
+              'ASYNCERR'              : -9,
+              'INVALID_ID'            : -12,
+              'RECORD_OUT_OF_RANGE'   : -13,
+              'REJECTED'              : -15,
+              'STOPPED'               : -16,
+              'BADREQ'                : -17,
+              'DBCREATE_FAILED'       : -18,
+              'THREADPOOL_INTERNAL'   : -20,
+              'READONLY'              : -21,
+              'NOMASTER'              : -101,
+              'UNTAGGED_DATABASE'     : -102,
+              'CONSTRAINTS'           : -103,
+              'DEADLOCK'              : 203,
+              'TRAN_IO_ERROR'         : -105,
+              'ACCESS'                : -106,
+              'TRAN_MODE_UNSUPPORTED' : -107,
+              'VERIFY_ERROR'          : 2,
+              'FKEY_VIOLATION'        : 3,
+              'NULL_CONSTRAINT'       : 4,
+              'CONV_FAIL'             : 113,
+              'NONKLESS'              : 114,
+              'MALLOC'                : 115,
+              'NOTSUPPORTED'          : 116,
+              'DUPLICATE'             : 299,
+              'TZNAME_FAIL'           : 401,
+              'UNKNOWN'               : 300,
              }
 """This dict maps all known Comdb2 error names to their respective values.
 
@@ -180,15 +179,15 @@
 """
 
 # Pull comdb2 column types from cdb2api.h into our namespace
-TYPE = {u'INTEGER'      : 1,
-        u'REAL'         : 2,
-        u'CSTRING'      : 3,
-        u'BLOB'         : 4,
-        u'DATETIME'     : 6,
-        u'INTERVALYM'   : 7,
-        u'INTERVALDS'   : 8,
-        u'DATETIMEUS'   : 9,
-        u'INTERVALDSUS' : 10,
+TYPE = {'INTEGER'      : 1,
+        'REAL'         : 2,
+        'CSTRING'      : 3,
+        'BLOB'         : 4,
+        'DATETIME'     : 6,
+        'INTERVALYM'   : 7,
+        'INTERVALDS'   : 8,
+        'DATETIMEUS'   : 9,
+        'INTERVALDSUS' : 10,
        }
 """This dict maps all known Comdb2 types to their enumeration value.
 
@@ -198,11 +197,11 @@
 """
 
 # Pull comdb2 handle flags from cdb2api.h into our namespace
-HANDLE_FLAGS = {u'READ_INTRANS_RESULTS' : 2,
-                u'DIRECT_CPU'           : 4,
-                u'RANDOM'               : 8,
-                u'RANDOMROOM'           : 16,
-                u'ROOM'                 : 32,
+HANDLE_FLAGS = {'READ_INTRANS_RESULTS' : 2,
+                'DIRECT_CPU'           : 4,
+                'RANDOM'               : 8,
+                'RANDOMROOM'           : 16,
+                'ROOM'                 : 32,
                }
 """This dict maps all known Comdb2 flags to their enumeration value.
 
@@ -211,7 +210,7 @@
 """
 
 
-class Handle(object):
+class Handle:
     """Represents a connection to a database.
 
     By default, the connection will be made to the cluster configured as the

comdb2/dbapi2.py

@@ -138,8 +138,8 @@
 NULL           ``None``
 integer        `int`
 real           `float`
-blob           `six.binary_type` (aka `bytes` in Python 3, ``str`` in Python 2)
-text           `six.text_type` (aka `str` in Python 3, ``unicode`` in Python 2)
+blob           `bytes`
+text           `str`
 datetime       `datetime.datetime`
 datetimeus     `DatetimeUs`
 ============   ================================================================
@@ -239,14 +239,12 @@
    `Connection.cursor` is called, we call `Cursor.close` on any existing, open
    cursor for that connection.
 """
-from __future__ import absolute_import, unicode_literals
 
 import functools
 import itertools
 import weakref
 import datetime
 import re
-import six
 
 from . import cdb2
 
@@ -298,13 +296,13 @@
     \s*           # then skip over any whitespace
     (\w+)         # and capture the first word
     """,
-    re.VERBOSE | re.DOTALL | (0 if six.PY2 else re.ASCII),
+    re.VERBOSE | re.DOTALL | re.ASCII,
 )
 _VALID_SP_NAME = re.compile(r'^[A-Za-z0-9_.]+$')
 
 
 @functools.total_ordering
-class _TypeObject(object):
+class _TypeObject:
     def __init__(self, *value_names):
         self.value_names = value_names
         self.values = [cdb2.TYPE[v] for v in value_names]
@@ -320,7 +318,7 @@ def __repr__(self):
 
 
 def _binary(string):
-    if isinstance(string, six.text_type):
+    if isinstance(string, str):
         return string.encode('utf-8')
     return bytes(string)
 
@@ -350,10 +348,7 @@ def _binary(string):
 TimestampFromTicks = Timestamp.fromtimestamp
 TimestampUsFromTicks = TimestampUs.fromtimestamp
 
-try:
-    UserException = StandardError  # Python 2
-except NameError:
-    UserException = Exception      # Python 3
+UserException = Exception
 
 
 class Error(UserException):
@@ -526,8 +521,8 @@ def _raise_wrapped_exception(exc):
     code = exc.error_code
     msg = '%s (cdb2api rc %d)' % (exc.error_message, code)
     if "null constraint violation" in msg:
-        six.raise_from(NonNullConstraintError(msg), exc)  # DRQS 86013831
-    six.raise_from(_EXCEPTION_BY_RC.get(code, OperationalError)(msg), exc)
+        raise NonNullConstraintError(msg) from exc  # DRQS 86013831
+    raise _EXCEPTION_BY_RC.get(code, OperationalError)(msg) from exc
 
 
 def _sql_operation(sql):
@@ -566,7 +561,7 @@ def connect(*args, **kwargs):
     return Connection(*args, **kwargs)
 
 
-class Connection(object):
+class Connection:
     """Represents a connection to a Comdb2 database.
 
     By default, the connection will be made to the cluster configured as the
@@ -774,7 +769,7 @@ def cursor(self):
     NotSupportedError = NotSupportedError
 
 
-class Cursor(object):
+class Cursor:
     """Class used to send requests through a database connection.
 
     This class is not meant to be instantiated directly; it should always be
@@ -1028,10 +1023,10 @@ def _execute(self, operation, sql, parameters=None):
             sql = sql % {name: "@" + name for name in parameters}
         except KeyError as keyerr:
             msg = "No value provided for parameter %s" % keyerr
-            six.raise_from(InterfaceError(msg), keyerr)
+            raise InterfaceError(msg) from keyerr
         except Exception as exc:
             msg = "Invalid Python format string for query"
-            six.raise_from(InterfaceError(msg), exc)
+            raise InterfaceError(msg) from exc
 
         if _operation_ends_transaction(operation):
             self._conn._in_transaction = False  # txn ends, even on failure

comdb2/factories.py

@@ -21,7 +21,6 @@
 A factory function will be called with a list of column names, and must return
 a callable that will be called once per row with a list of column values.
 """
-from __future__ import unicode_literals
 from collections import namedtuple
 from collections import Counter