cwrap 1.6.6__py3-none-any.whl → 1.6.7__py3-none-any.whl

cwrap/__init__.py

@@ -28,26 +28,36 @@ the process of interacting with a C library:
      FILE pointer.
 """
 
-try: from .version import version as __version__
-except ImportError: __version__ = '0.0.0'
+try:
+    from .version import version as __version__
+except ImportError:
+    __version__ = "0.0.0"
 
-__author__ = 'Statoil ASA'
-__copyright__ = 'Copyright 2016, Statoil ASA'
+__author__ = "Statoil ASA"
+__copyright__ = "Copyright 2016, Statoil ASA"
 __credits__ = __author__
-__license__ = 'GPL'
+__license__ = "GPL"
 __maintainer__ = __author__
-__email__ = 'fg_gpl@statoil.com'
-__status__ = 'Prototype'
+__email__ = "fg_gpl@statoil.com"
+__status__ = "Prototype"
 
 from .basecclass import BaseCClass
 from .basecenum import BaseCEnum
 from .basecvalue import BaseCValue
-
-from .cfile import CFILE, copen as open
-from .clib import load, lib_name
-
+from .cfile import CFILE
+from .cfile import copen as open
+from .clib import lib_name, load
 from .metacwrap import MetaCWrap
-from .prototype import REGISTERED_TYPES, Prototype, PrototypeError
-
-__all__ = ['BaseCClass', 'BaseCEnum', 'BaseCValue', 'CFILE', 'open',
-           'MetaCWrap', 'Prototype', 'load', 'lib_name']
+from .prototype import REGISTERED_TYPES, Prototype, PrototypeError  # noqa
+
+__all__ = [
+    "BaseCClass",
+    "BaseCEnum",
+    "BaseCValue",
+    "CFILE",
+    "open",
+    "MetaCWrap",
+    "Prototype",
+    "load",
+    "lib_name",
+]

cwrap/basecclass.py

@@ -14,16 +14,12 @@
 #  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
 #  for more details.
 
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-
-import six
-
 import ctypes
+
 from .metacwrap import MetaCWrap
 
-@six.add_metaclass(MetaCWrap)
-class BaseCClass(object):
+
+class BaseCClass(metaclass=MetaCWrap):
     namespaces = {}
 
     def __init__(self, c_pointer, parent=None, is_reference=False):
@@ -31,14 +27,16 @@ class BaseCClass(object):
             raise ValueError("Must have a valid (not null) pointer value!")
 
         if c_pointer < 0:
-            raise ValueError("The pointer value is negative! This may be correct, but usually is not!")
+            raise ValueError(
+                "The pointer value is negative! This may be correct, but usually is not!"
+            )
 
         self.__c_pointer = c_pointer
         self.__parent = parent
         self.__is_reference = is_reference
 
     def __new__(cls, *more, **kwargs):
-        obj = super(BaseCClass, cls).__new__(cls)
+        obj = super().__new__(cls)
         obj.__c_pointer = None
         obj.__parent = None
         obj.__is_reference = False
@@ -52,7 +50,7 @@ class BaseCClass(object):
         return self.__c_pointer
 
     def _ad_str(self):
-        return 'at 0x%x' % self._address()
+        return f"at 0x{self._address():x}"
 
     @classmethod
     def from_param(cls, c_class_object):
@@ -61,14 +59,16 @@ class BaseCClass(object):
 
         if c_class_object is None:
             return ctypes.c_void_p()
-        else:
-            return ctypes.c_void_p(c_class_object.__c_pointer)
+
+        return ctypes.c_void_p(c_class_object.__c_pointer)
 
     @classmethod
     def createPythonObject(cls, c_pointer):
         if c_pointer is not None:
             new_obj = cls.__new__(cls)
-            BaseCClass.__init__(new_obj, c_pointer=c_pointer, parent=None, is_reference=False)
+            BaseCClass.__init__(
+                new_obj, c_pointer=c_pointer, parent=None, is_reference=False
+            )
             return new_obj
         else:
             return None
@@ -77,7 +77,9 @@ class BaseCClass(object):
     def createCReference(cls, c_pointer, parent=None):
         if c_pointer is not None:
             new_obj = cls.__new__(cls)
-            BaseCClass.__init__(new_obj, c_pointer=c_pointer, parent=parent, is_reference=True)
+            BaseCClass.__init__(
+                new_obj, c_pointer=c_pointer, parent=parent, is_reference=True
+            )
             return new_obj
         else:
             return None
@@ -90,7 +92,6 @@ class BaseCClass(object):
         self.__is_reference = True
         self.__parent = parent
 
-
     def setParent(self, parent=None):
         if self.__is_reference:
             self.__parent = parent
@@ -100,7 +101,7 @@ class BaseCClass(object):
         return self
 
     def isReference(self):
-        """ @rtype: bool """
+        """@rtype: bool"""
         return self.__is_reference
 
     def parent(self):
@@ -113,7 +114,7 @@ class BaseCClass(object):
         if isinstance(other, BaseCClass):
             return self.__c_pointer == other.__c_pointer
         else:
-            return super(BaseCClass , self) == other
+            return super() == other
 
     def __hash__(self):
         # Similar to last resort comparison; this returns the hash of the
@@ -123,37 +124,31 @@ class BaseCClass(object):
     def free(self):
         raise NotImplementedError("A BaseCClass requires a free method implementation!")
 
-    def _create_repr(self, args = ''):
+    def _create_repr(self, args=""):
         """Representation on the form (e.g.) 'EclFile(...) at 0x1729'."""
-        return "{0}({1}) {2}".format(self.__class__.__name__, args, self._ad_str())
+        return f"{self.__class__.__name__}({args}) {self._ad_str()}"
 
     def __repr__(self):
         """Representation on the form (e.g.) 'EclFile(...) at 0x1729'."""
         return self._create_repr()
 
     def __del__(self):
-        if self.free is not None:
-            if not self.__is_reference:
-                # Important to check the c_pointer; in the case of failed object creation
-                # we can have a Python object with c_pointer == None.
-                if self.__c_pointer:
-                    self.free()
+        if self.free is not None and not self.__is_reference and self.__c_pointer:
+            # Important to check the c_pointer; in the case of failed object creation
+            # we can have a Python object with c_pointer == None.
+            self.free()
 
     def _invalidateCPointer(self):
         self.__c_pointer = None
 
-
     def __bool__(self):
         """The BaseCClass instance will evaluate to true if it is bound to an
         underlying C object, otherwise it will evaluate to False. More
         elaborate bool tests should be implemented in the derived
         class.
         """
-        if self.__c_pointer:
-            return True
-        else:
-            return False
 
+        return bool(self.__c_pointer)
 
     def __nonzero__(self):
-        return self.__bool__( )
+        return self.__bool__()

cwrap/basecenum.py

@@ -14,17 +14,12 @@
 #  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
 #  for more details.
 
-from __future__ import absolute_import, division, print_function, unicode_literals
-
 import ctypes
 
-import six
-
 from .metacwrap import MetaCWrap
 
 
-@six.add_metaclass(MetaCWrap)
-class BaseCEnum(object):
+class BaseCEnum(metaclass=MetaCWrap):
     enum_namespace = {}
 
     def __init__(self, *args, **kwargs):
@@ -36,11 +31,11 @@ class BaseCEnum(object):
             enum = cls.__resolveEnum(args[0])
 
             if enum is None:
-                raise ValueError("Unknown enum value: %i" % args[0])
+                raise ValueError(f"Unknown enum value: {args[0]}")
 
             return enum
         else:
-            obj = super(BaseCEnum, cls).__new__(cls, *args)
+            obj = super().__new__(cls, *args)
             obj.name = None
             obj.value = None
             return obj
@@ -57,7 +52,7 @@ class BaseCEnum(object):
             if enum.name == name:
                 return enum
 
-        raise ValueError("No such enum:%s" % name)
+        raise ValueError(f"No such enum: {name}")
 
     @classmethod
     def addEnum(cls, name, value):
@@ -102,7 +97,7 @@ class BaseCEnum(object):
         cn = self.__class__.__name__
         na = self.name
         va = self.value
-        return '%s(name = "%s", value = %s)' % (cn, na, va)
+        return f'{cn}(name = "{na}", value = {va})'
 
     def __add__(self, other):
         self.__assertOtherIsSameType(other)
@@ -126,7 +121,7 @@ class BaseCEnum(object):
 
     def __int__(self):
         return self.value
-    
+
     def __index__(self):
         return self.value
 
@@ -136,7 +131,7 @@ class BaseCEnum(object):
     @classmethod
     def __createEnum(cls, value):
         enum = cls.__new__(cls)
-        enum.name = "Unnamed '%s' enum with value: %i" % (str(cls.__name__), value)
+        enum.name = f"Unnamed '{cls.__name__}' enum with value: {value}"
         enum.value = value
         return enum
 
@@ -159,20 +154,16 @@ class BaseCEnum(object):
     def __assertOtherIsSameType(self, other):
         assert isinstance(
             other, self.__class__
-        ), "Can only operate on enums of same type: %s =! %s" % (
-            self.__class__.__name__,
-            other.__class__.__name__,
-        )
+        ), f"Can only operate on enums of same type: {self.__class__.__name__} =! {other.__class__.__name__}"
 
     @classmethod
     def populateEnum(cls, library, enum_provider_function):
         try:
             func = getattr(library, enum_provider_function)
-        except AttributeError:
+        except AttributeError as err:
             raise ValueError(
-                "Could not find enum description function: %s - can not load enum: %s."
-                % (enum_provider_function, cls.__name__)
-            )
+                f"Could not find enum description function: {enum_provider_function} - can not load enum: {cls.__name__}."
+            ) from err
 
         func.restype = ctypes.c_char_p
         func.argtypes = [ctypes.c_int, ctypes.POINTER(ctypes.c_int)]

cwrap/basecvalue.py

@@ -14,30 +14,52 @@
 #  See the GNU General Public License at <http://www.gnu.org/licenses/gpl.html>
 #  for more details.
 
-from __future__ import (absolute_import, division,
-                        print_function, unicode_literals)
-
-import six
-
-from ctypes import (pointer, c_long, c_int, c_bool, c_float, c_double, c_byte,
-                    c_short, c_char, c_ubyte, c_ushort, c_uint, c_ulong)
+from ctypes import (
+    c_bool,
+    c_byte,
+    c_char,
+    c_double,
+    c_float,
+    c_int,
+    c_long,
+    c_short,
+    c_ubyte,
+    c_uint,
+    c_ulong,
+    c_ushort,
+    pointer,
+)
 
 from .metacwrap import MetaCWrap
 
-@six.add_metaclass(MetaCWrap)
-class BaseCValue(object):
+
+class BaseCValue(metaclass=MetaCWrap):
     DATA_TYPE = None
-    LEGAL_TYPES = [c_byte, c_ubyte, c_short, c_ushort, c_int, c_uint, c_long, c_ulong, c_bool, c_char, c_float, c_double]
+    LEGAL_TYPES = [
+        c_byte,
+        c_ubyte,
+        c_short,
+        c_ushort,
+        c_int,
+        c_uint,
+        c_long,
+        c_ulong,
+        c_bool,
+        c_char,
+        c_float,
+        c_double,
+    ]
 
     def __init__(self, value):
-        super(BaseCValue, self).__init__()
+        super().__init__()
 
         if not self.DATA_TYPE in self.LEGAL_TYPES:
-            raise ValueError("DATA_TYPE must be one of these CTypes classes: %s" % BaseCValue.LEGAL_TYPES)
+            raise ValueError(
+                f"DATA_TYPE must be one of these CTypes classes: {BaseCValue.LEGAL_TYPES}"
+            )
 
         self.__value = self.cast(value)
 
-
     def value(self):
         return self.__value.value
 

cwrap/cfile.py

@@ -15,160 +15,95 @@
 #  for more details.
 
 import os
-import six
-import sys
-from .prototype import Prototype
-from .basecclass import BaseCClass
 
+from .basecclass import BaseCClass
+from .clib import load as cwrapload
+from .prototype import Prototype
 
-if six.PY2:
-    import ctypes
-
-    def copen(filename, mode='r'):
-        """
-        This is a compatibility layer for functions taking FILE* pointers, and
-        should not be used unless absolutely needed.
 
-        In Python 2 this function is simply an alias for open. In Python 3,
-        however, it returns an instance of CWrapFile, a very light weight
-        wrapper around a FILE* instance.
-        """
-        return open(filename, mode)
-
-    class CFILE(BaseCClass):
-        """
-        Utility class to map a Python file handle <-> FILE* in C
-        """
-        TYPE_NAME = "FILE"
-
-        _as_file = Prototype(ctypes.pythonapi, "void* PyFile_AsFile(py_object)")
-
-        def __init__(self, py_file):
-            """
-            Takes a python file handle and looks up the underlying FILE *
-
-            The purpose of the CFILE class is to be able to use python
-            file handles when calling C functions which expect a FILE
-            pointer. A CFILE instance should be created based on the
-            Python file handle, and that should be passed to the function
-            expecting a FILE pointer.
-
-            The implementation is based on the ctypes object
-            pythonapi which is ctypes wrapping of the CPython api.
-
-              C-function:
-                 void fprintf_hello(FILE * stream , const char * msg);
-
-              Python wrapper:
-                 lib = clib.load( "lib.so" )
-                 fprintf_hello = Prototype(lib, "void fprintf_hello( FILE , char* )")
-
-              Python use:
-                 py_fileH = open("file.txt" , "w")
-                 fprintf_hello( CFILE( py_fileH ) , "Message ...")
-                 py_fileH.close()
-
-            If the supplied argument is not of type py_file the function
-            will raise a TypeException.
-
-            Examples: ecl.ecl.ecl_kw.EclKW.fprintf_grdecl()
-            """
-            c_ptr = self._as_file(py_file)
-            try:
-                super(CFILE, self).__init__(c_ptr)
-            except ValueError:
-                raise TypeError("Sorry - the supplied argument is not a valid "
-                                " Python file handle!")
-
-            self.py_file = py_file
-
-        def __del__(self):
-            pass
-
-
-if six.PY3:
-    from .clib import load as cwrapload
-
-    class LibcPrototype(Prototype):
-        # Load the c standard library (on Linux passsing None does the trick)
-        lib = cwrapload('msvcrt' if os.name == 'nt' else None)
-
-        def __init__(self, prototype, bind=False, allow_attribute_error=False):
-            super(LibcPrototype, self).__init__(
-                LibcPrototype.lib,
-                prototype,
-                bind=bind,
-                allow_attribute_error=allow_attribute_error)
-
-    def copen(filename, mode='r'):
-        """
-        This is a compatibility layer for functions taking FILE* pointers, and
-        should not be used unless absolutely needed.
-
-        In Python 2 this function is simply an alias for open. In Python 3,
-        however, it returns an instance of CWrapFile, a very lightweight
-        wrapper around a FILE* instance.
-        """
-        return CWrapFile(filename, mode)
-
-    class CWrapFile(BaseCClass):
-        """
-        This is a compatibility layer for functions taking FILE* pointers, and
-        should not be used unless absolutely needed.
-
-        CWrapFile is a very lightweight wrapper around FILE* instances. It is
-        meant be used inplace of python file objects that are to be passed to
-        foreign function calls under python 3.
-
-        Example:
-            with cwrap.open('filename', 'mode') as f:
-                foreign_function_call(f)
-        """
-
-        TYPE_NAME = "FILE"
-
-        _fopen = LibcPrototype("void* fopen (char*, char*)")
-        _fclose = LibcPrototype("int fclose (FILE)", bind=True)
-        _fflush = LibcPrototype("int fflush (FILE)", bind=True)
-
-        def __init__(self, fname, mode):
-            c_ptr = self._fopen(fname, mode)
-            self._mode = mode
-            self._fname = fname
-            self._closed = False
-
-            try:
-                super(CWrapFile, self).__init__(c_ptr)
-            except ValueError:
-                self._closed = True
-                raise IOError('Could not open file "{}" in mode {}'
-                              .format(fname, mode))
-
-        def close(self):
-            if not self._closed:
-                self._fflush()
-                cs = self._fclose()
-                if (cs != 0):
-                    raise IOError("Failed to close file")
-                self._closed = True
-
-        def __enter__(self):
-            return self
-
-        def __exit__(self, exc_type, exc_val, exc_tb):
-            self.close()
-            return exc_type is None
-
-        def free(self):
-            self.close()
-
-        def __del__(self):
-            self.close()
-
-    def CFILE(f):
-        if not isinstance(f, CWrapFile):
-            raise TypeError("This function requires the use of CWrapFile, "
-                            "not {} when running Python 3. See "
-                            "help(cwrap.open) for more info"
-                            .format(type(f).__name__))
-        return f
+class LibcPrototype(Prototype):
+    # Load the c standard library (on Linux passsing None does the trick)
+    lib = cwrapload("msvcrt" if os.name == "nt" else None)
+
+    def __init__(self, prototype, bind=False, allow_attribute_error=False):
+        super().__init__(
+            LibcPrototype.lib,
+            prototype,
+            bind=bind,
+            allow_attribute_error=allow_attribute_error,
+        )
+
+
+def copen(filename, mode="r"):
+    """
+    This is a compatibility layer for functions taking FILE* pointers, and
+    should not be used unless absolutely needed.
+
+    It returns an instance of CWrapFile, a very lightweight
+    wrapper around a FILE* instance.
+    """
+    return CWrapFile(filename, mode)
+
+
+class CWrapFile(BaseCClass):
+    """
+    This is a compatibility layer for functions taking FILE* pointers, and
+    should not be used unless absolutely needed.
+
+    CWrapFile is a very lightweight wrapper around FILE* instances. It is
+    meant be used inplace of python file objects that are to be passed to
+    foreign function calls under python 3.
+
+    Example:
+        with cwrap.open('filename', 'mode') as f:
+            foreign_function_call(f)
+    """
+
+    TYPE_NAME = "FILE"
+
+    _fopen = LibcPrototype("void* fopen (char*, char*)")
+    _fclose = LibcPrototype("int fclose (FILE)", bind=True)
+    _fflush = LibcPrototype("int fflush (FILE)", bind=True)
+
+    def __init__(self, fname, mode):
+        c_ptr = self._fopen(fname, mode)
+        self._mode = mode
+        self._fname = fname
+        self._closed = False
+
+        try:
+            super().__init__(c_ptr)
+        except ValueError as err:
+            self._closed = True
+            raise OSError(f'Could not open file "{fname}" in mode {mode}') from err
+
+    def close(self):
+        if not self._closed:
+            self._fflush()
+            cs = self._fclose()
+            if cs != 0:
+                raise OSError("Failed to close file")
+            self._closed = True
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        self.close()
+        return exc_type is None
+
+    def free(self):
+        self.close()
+
+    def __del__(self):
+        self.close()
+
+
+def CFILE(f):
+    if not isinstance(f, CWrapFile):
+        raise TypeError(
+            "This function requires the use of CWrapFile, "
+            f"not {type(f).__name__} when running Python 3. See "
+            "help(cwrap.open) for more info"
+        )
+    return f

cwrap/clib.py

@@ -31,45 +31,46 @@ be invoked when loading libert_geometry, and that could in principle
 lead to loading a different version of libert_util.so
 """
 
-import platform
 import ctypes
 import os
+import platform
 
-so_extension = {"linux"  : "so",
-                "linux2" : "so",
-                "linux3" : "so",
-                "windows": "dll",
-                "darwin" : "dylib" }
+so_extension = {
+    "linux": "so",
+    "linux2": "so",
+    "linux3": "so",
+    "windows": "dll",
+    "darwin": "dylib",
+}
 
 
 # Passing None to the CDLL() function means to open a lib handle to
 # the current runnning process, i.e. like dlopen( NULL ). We must
 # special case this to avoid creating the bogus argument 'None.so'.
 
-def lib_name(lib , path = None , so_version = None, so_ext = None):
+
+def lib_name(lib, path=None, so_version=None, so_ext=None):
     if lib is None:
         return None
     else:
         platform_key = platform.system().lower()
         if so_version is None:
-            so_version = ''
+            so_version = ""
 
         if so_ext:
-            so_name = "%s.%s%s" % (lib, so_ext, so_version)
+            so_name = f"{lib}.{so_ext}{so_version}"
         elif platform_key == "darwin":
-            so_name = "%s%s.%s" % (lib, so_version, so_extension[ platform_key ])
+            so_name = f"{lib}{so_version}.{so_extension[platform_key]}"
         else:
-            so_name = "%s.%s%s" % (lib, so_extension[ platform_key ], so_version)
+            so_name = f"{lib}.{so_extension[platform_key]}{so_version}"
 
         if path:
-            return os.path.join( path , so_name )
+            return os.path.join(path, so_name)
         else:
             return so_name
 
 
-
-
-def load( lib, so_version = None, path = None, so_ext = None):
+def load(lib, so_version=None, path=None, so_ext=None):
     """Thin wrapper around the ctypes.CDLL function for loading shared
     library.
 
@@ -79,32 +80,33 @@ def load( lib, so_version = None, path = None, so_ext = None):
     """
 
     dll = None
-    lib_files = [ lib_name( lib, path = None, so_version = so_version ),
-                  lib_name( lib, path = None, so_version = so_version, so_ext = so_ext ),
-                  lib_name( lib, path = path, so_version = so_version ),
-                  lib_name( lib, path = path, so_version = so_version, so_ext = so_ext )
-                ]
+    lib_files = [
+        lib_name(lib, path=None, so_version=so_version),
+        lib_name(lib, path=None, so_version=so_version, so_ext=so_ext),
+        lib_name(lib, path=path, so_version=so_version),
+        lib_name(lib, path=path, so_version=so_version, so_ext=so_ext),
+    ]
 
     for lib_file in lib_files:
         try:
-            dll = ctypes.CDLL(lib_file , ctypes.RTLD_GLOBAL)
+            dll = ctypes.CDLL(lib_file, ctypes.RTLD_GLOBAL)
             return dll
         except Exception as exc:
             error = exc
 
-    error_msg = "\nFailed to load shared library:%s\n\ndlopen() error: %s\n" % (lib , error)
+    error_msg = f"\nFailed to load shared library:{lib}\n\ndlopen() error: {error}\n"
 
     LD_LIBRARY_PATH = os.getenv("LD_LIBRARY_PATH")
     if not LD_LIBRARY_PATH:
         LD_LIBRARY_PATH = ""
 
-    error_msg += """
+    error_msg += f"""
 The runtime linker has searched through the default location of shared
 libraries, and also the locations mentioned in your LD_LIBRARY_PATH
 variable. Your current LD_LIBRARY_PATH setting is:
 
-   LD_LIBRARY_PATH: %s
+   LD_LIBRARY_PATH: {LD_LIBRARY_PATH}
 
 You might need to update this variable?
-""" % LD_LIBRARY_PATH
+"""
     raise ImportError(error_msg)

cwrap/metacwrap.py

@@ -15,27 +15,23 @@
 #  for more details.
 
 import re
-from types import MethodType
 
 from .prototype import Prototype
 
 
 def snakeCase(name):
-    s1 = re.sub('(.)([A-Z][a-z]+)', r'\1_\2', name)
-    return re.sub('([a-z0-9])([A-Z])', r'\1_\2', s1).lower()
+    s1 = re.sub("(.)([A-Z][a-z]+)", r"\1_\2", name)
+    return re.sub("([a-z0-9])([A-Z])", r"\1_\2", s1).lower()
 
 
 class MetaCWrap(type):
     def __init__(cls, name, bases, attrs):
-        super(MetaCWrap, cls).__init__(name, bases, attrs)
+        super().__init__(name, bases, attrs)
 
         is_return_type = False
         storage_type = None
 
-        if "TYPE_NAME" in attrs:
-            type_name = attrs["TYPE_NAME"]
-        else:
-            type_name = snakeCase(name)
+        type_name = attrs["TYPE_NAME"] if "TYPE_NAME" in attrs else snakeCase(name)
 
         if hasattr(cls, "DATA_TYPE") or hasattr(cls, "enums"):
             is_return_type = True
@@ -43,14 +39,25 @@ class MetaCWrap(type):
         if hasattr(cls, "storageType"):
             storage_type = cls.storageType()
 
-        Prototype.registerType(type_name, cls, is_return_type=is_return_type, storage_type=storage_type)
+        Prototype.registerType(
+            type_name, cls, is_return_type=is_return_type, storage_type=storage_type
+        )
 
         if hasattr(cls, "createCReference"):
-            Prototype.registerType("%s_ref" % type_name, cls.createCReference, is_return_type=True, storage_type=storage_type)
+            Prototype.registerType(
+                f"{type_name}_ref",
+                cls.createCReference,
+                is_return_type=True,
+                storage_type=storage_type,
+            )
 
         if hasattr(cls, "createPythonObject"):
-            Prototype.registerType("%s_obj" % type_name, cls.createPythonObject, is_return_type=True, storage_type=storage_type)
-
+            Prototype.registerType(
+                f"{type_name}_obj",
+                cls.createPythonObject,
+                is_return_type=True,
+                storage_type=storage_type,
+            )
 
         for key, attr in attrs.items():
             if isinstance(attr, Prototype):

cwrap/prototype.py

@@ -20,10 +20,8 @@ import re
 import sys
 from types import MethodType
 
-import six
 
-
-class TypeDefinition(object):
+class TypeDefinition:
     def __init__(self, type_class_or_function, is_return_type, storage_type, errcheck):
         self.storage_type = storage_type
         self.is_return_type = is_return_type
@@ -34,36 +32,32 @@ class TypeDefinition(object):
         self.errcheck = errcheck
 
 
-if six.PY3:
-
-    class CStringHelper(object):
-        @classmethod
-        def from_param(cls, value):
-            if value is None:
-                return None
-            elif isinstance(value, bytes):
-                return value
-            elif isinstance(value, ctypes.Array):
-                return value
-            else:
-                e = value.encode()
-                return e
-
-        @staticmethod
-        def toStr(result, func, arguments):
-            """
-            Transform a foreign char* type to str (if python 3).
-
-            ctypes functions have an attribute called errcheck that can not
-            only be used for error checking but also to alter the result. If
-            errcheck is defined, the value returned from that function is what
-            is returned from the foreign function call. In this case, C returns
-            strings in the form of zero-terminated char* strings. To use these
-            as python strings (str) they must be decoded.
-            """
-            if result is None or result == 0:
-                return None
-            return result.decode()
+class CStringHelper:
+    @classmethod
+    def from_param(cls, value):
+        if value is None:
+            return None
+        elif isinstance(value, (bytes, ctypes.Array)):
+            return value
+        else:
+            e = value.encode()
+            return e
+
+    @staticmethod
+    def toStr(result, func, arguments):
+        """
+        Transform a foreign char* type to str.
+
+        ctypes functions have an attribute called errcheck that can not
+        only be used for error checking but also to alter the result. If
+        errcheck is defined, the value returned from that function is what
+        is returned from the foreign function call. In this case, C returns
+        strings in the form of zero-terminated char* strings. To use these
+        as python strings (str) they must be decoded.
+        """
+        if result is None or result == 0:
+            return None
+        return result.decode()
 
 
 REGISTERED_TYPES = {}
@@ -78,7 +72,7 @@ def _registerType(
     errcheck=None,
 ):
     if type_name in REGISTERED_TYPES:
-        raise PrototypeError("Type: '%s' already registered!" % type_name)
+        raise PrototypeError(f"Type: '{type_name}' already registered!")
 
     REGISTERED_TYPES[type_name] = TypeDefinition(
         type_class_or_function, is_return_type, storage_type, errcheck
@@ -100,16 +94,14 @@ _registerType("bool*", ctypes.POINTER(ctypes.c_bool))
 _registerType("long", ctypes.c_long)
 _registerType("long*", ctypes.POINTER(ctypes.c_long))
 _registerType("char", ctypes.c_char)
-if six.PY2:
-    _registerType("char*", ctypes.c_char_p)
-    _registerType("char**", ctypes.POINTER(ctypes.c_char_p))
-if six.PY3:
-    _registerType(
-        "char*",
-        CStringHelper,
-        storage_type=ctypes.c_char_p,
-        errcheck=CStringHelper.toStr,
-    )
+
+
+_registerType(
+    "char*",
+    CStringHelper,
+    storage_type=ctypes.c_char_p,
+    errcheck=CStringHelper.toStr,
+)
 _registerType("float", ctypes.c_float)
 _registerType("float*", ctypes.POINTER(ctypes.c_float))
 _registerType("double", ctypes.c_double)
@@ -127,11 +119,11 @@ class PrototypeError(Exception):
     pass
 
 
-class Prototype(object):
+class Prototype:
     pattern = re.compile(PROTOTYPE_PATTERN)
 
     def __init__(self, lib, prototype, bind=False, allow_attribute_error=False):
-        super(Prototype, self).__init__()
+        super().__init__()
         self._lib = lib
         self._prototype = prototype
         self._bind = bind
@@ -151,7 +143,7 @@ class Prototype(object):
                 type_definition.storage_type,
                 type_definition.errcheck,
             )
-        raise ValueError("Unknown type: %s" % type_name)
+        raise ValueError(f"Unknown type: {type_name}")
 
     def shouldBeBound(self):
         return self._bind
@@ -159,7 +151,7 @@ class Prototype(object):
     def resolve(self):
         match = re.match(Prototype.pattern, self._prototype)
         if not match:
-            raise PrototypeError("Illegal prototype definition: %s\n" % self._prototype)
+            raise PrototypeError(f"Illegal prototype definition: {self._prototype}\n")
         else:
             restype = match.groupdict()["return"]
             function_name = match.groupdict()["function"]
@@ -168,29 +160,26 @@ class Prototype(object):
 
             try:
                 func = getattr(self._lib, function_name)
-            except AttributeError:
+            except AttributeError as err:
                 if self._allow_attribute_error:
                     return
                 raise PrototypeError(
-                    "Can not find function: %s in library: %s"
-                    % (function_name, self._lib)
-                )
+                    f"Can not find function: {function_name} in library: {self._lib}"
+                ) from err
 
             if (
                 not restype in REGISTERED_TYPES
                 or not REGISTERED_TYPES[restype].is_return_type
             ):
                 sys.stderr.write(
-                    "The type used as return type: %s is not registered as a return type.\n"
-                    % restype
+                    f"The type used as return type: {restype} is not registered as a return type.\n"
                 )
 
                 return_type, storage_type, errcheck = self._parseType(restype)
 
                 if inspect.isclass(return_type):
                     sys.stderr.write(
-                        "  Correct type may be: %s_ref or %s_obj.\n"
-                        % (restype, restype)
+                        f"  Correct type may be: {restype}_ref or {restype}_obj.\n"
                     )
 
                 return None
@@ -227,7 +216,7 @@ class Prototype(object):
         if self._func is None:
             if self._allow_attribute_error:
                 raise NotImplementedError(
-                    "Function:%s has not been properly resolved" % self.__name__
+                    f"Function:{self.__name__} has not been properly resolved"
                 )
             else:
                 raise PrototypeError("Prototype has not been properly resolved")
@@ -249,15 +238,8 @@ class Prototype(object):
             tokens = re.split("[ :]", errMsg)
             argidx = int(tokens[1]) - 1  # it starts from 1
             raise TypeError(
-                (
-                    "Argument {argidx}: cannot create a {argtype} from the given "
-                    "value {actval} ({acttype})"
-                ).format(
-                    argtype=self._func.argtypes[argidx],
-                    argidx=argidx,
-                    actval=repr(args[argidx]),
-                    acttype=type(args[argidx]),
-                )
+                f"Argument {argidx}: cannot create a {self._func.argtypes[argidx]} from the given "
+                f"value {repr(args[argidx])} ({type(args[argidx])})"
             ) from err
 
     def __get__(self, instance, owner):
@@ -265,10 +247,7 @@ class Prototype(object):
             self.resolve()
             self._resolved = True
         if self.shouldBeBound():
-            if six.PY2:
-                return MethodType(self, instance, owner)
-            if six.PY3:
-                return MethodType(self, instance)
+            return MethodType(self, instance)
         else:
             return self
 
@@ -277,7 +256,7 @@ class Prototype(object):
         if self.shouldBeBound():
             bound = ", bind=True"
 
-        return 'Prototype("%s"%s)' % (self._prototype, bound)
+        return f'Prototype("{self._prototype}"{bound})'
 
     @classmethod
     def registerType(

cwrap/version.py

@@ -12,5 +12,5 @@ __version__: str
 __version_tuple__: VERSION_TUPLE
 version_tuple: VERSION_TUPLE
 
-__version__ = version = '1.6.6'
-__version_tuple__ = version_tuple = (1, 6, 6)
+__version__ = version = '1.6.7'
+__version_tuple__ = version_tuple = (1, 6, 7)

{cwrap-1.6.6.dist-info → cwrap-1.6.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: cwrap
-Version: 1.6.6
+Version: 1.6.7
 Summary: cwrap - ctypes blanket
 Home-page: https://github.com/Statoil/cwrap
 Author: Statoil ASA
@@ -22,7 +22,6 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Software Development :: Libraries
 Classifier: Topic :: Utilities
 License-File: LICENSE
-Requires-Dist: six
 
 
 =======

cwrap-1.6.7.dist-info/RECORD

@@ -0,0 +1,14 @@
+cwrap/__init__.py,sha256=jaZFUAG-rgT5RBJURcR_PCzGFmudtoAMaITTho0QIoY,1935
+cwrap/basecclass.py,sha256=MtJQddSMegJ3TJ13rZM40_WV6DBnIVtdeIilbk7yLuI,4804
+cwrap/basecenum.py,sha256=2Q8LsFZWMQRCuqcvkIZWczKctNCg40eaQAp8lCFoRCo,5119
+cwrap/basecvalue.py,sha256=Idg2EnyVuRD6Eh8xjcXVuiGsqpjakKnq8hSwjczrAA8,2102
+cwrap/cfile.py,sha256=vkVpZZ_BsM6etqnLja7XNbBR9bBSGxTYR7VhhC1qCJs,3233
+cwrap/clib.py,sha256=E94IqKHOoGozwbrPFe38XCretUzPr5MEdTK0tg5_VKI,3591
+cwrap/metacwrap.py,sha256=hZkY1piH7R8dahydIxIHd8RQjkKm9gqHGtUKsQhqpaE,2017
+cwrap/prototype.py,sha256=Djzv6KO91VZjp-X8VOXDpEFwq1qNSBxkMnUZZv01EBg,9228
+cwrap/version.py,sha256=UBH9kvxesdE0svvcKwHfK8rz5bJUzNXPBHo7APqVEfk,411
+cwrap-1.6.7.dist-info/LICENSE,sha256=KdZLnTl6Qk0PT7wUW8ugRdviqwxU5wjE26sku5sicOU,674
+cwrap-1.6.7.dist-info/METADATA,sha256=YlKh1653mezcM30tOrxPf6amaGscK0ql9UFx4oxYv9w,1203
+cwrap-1.6.7.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+cwrap-1.6.7.dist-info/top_level.txt,sha256=CUjoCmJmjoO-LFc7eRvSm7AHuFbYgwHhkQ6Al-x6sTk,6
+cwrap-1.6.7.dist-info/RECORD,,

cwrap-1.6.6.dist-info/RECORD

@@ -1,14 +0,0 @@
-cwrap/__init__.py,sha256=u26LODQXzzMi3d43B6gHd0vX2FM44J-ooNnVp2nfKV0,1875
-cwrap/basecclass.py,sha256=HgrEyQIfa5tcrOROv-4_wQfYuESJebO1HsrgIw1zL2g,5020
-cwrap/basecenum.py,sha256=roAqm0v0AiVf-uDzFambT_D3YGVlQxVSweNdkJH7SFM,5319
-cwrap/basecvalue.py,sha256=gEcwMHdZ7q7zn7Ou1ZG-OfLSUlIZf2X1xRVUmseo88o,2091
-cwrap/cfile.py,sha256=1qdryUEMPbZbWccYyFSd_gT4EMk6CrlAvi2MEqmv-mY,5948
-cwrap/clib.py,sha256=pAOc6-uEVQxzWcx2hry35WecxTi4gmv92sQcGVghiLo,3756
-cwrap/metacwrap.py,sha256=He9HtExc78S9uz08u_za_N1e8DBHcyf_JT3-R3LzSNs,1931
-cwrap/prototype.py,sha256=op5zQGV8rA4qodajxGN-UTfuyx6XDPjypiZAB4C1YEo,10013
-cwrap/version.py,sha256=Nz1l8vGPOAOAlxWDepNu28nfH9fOKk0GnGSnVyZJsFE,411
-cwrap-1.6.6.dist-info/LICENSE,sha256=KdZLnTl6Qk0PT7wUW8ugRdviqwxU5wjE26sku5sicOU,674
-cwrap-1.6.6.dist-info/METADATA,sha256=bZSHL23VCIRAqONcQoeR-slRe6o-f4Fyn3ctqZTON7c,1222
-cwrap-1.6.6.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-cwrap-1.6.6.dist-info/top_level.txt,sha256=CUjoCmJmjoO-LFc7eRvSm7AHuFbYgwHhkQ6Al-x6sTk,6
-cwrap-1.6.6.dist-info/RECORD,,