myokit 1.34.0__py3-none-any.whl → 1.35.0__py3-none-any.whl

myokit/_sim/mcl.h

@@ -67,7 +67,6 @@ static int
 mcl_flag2(const char* msg, const cl_int flag)
 {
     char sub[1024];
-    char err[2048];
 
     if(flag == CL_SUCCESS) {
         return 0;
@@ -82,164 +81,163 @@ mcl_flag2(const char* msg, const cl_int flag)
     switch(flag) {
         // OpenCL 1.0 Errors
         case CL_DEVICE_NOT_FOUND:
-            sprintf(err, "OpenCL error%s: CL_DEVICE_NOT_FOUND", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_DEVICE_NOT_FOUND", sub);
             break;
         case CL_DEVICE_NOT_AVAILABLE:
-            sprintf(err, "OpenCL error%s: CL_DEVICE_NOT_AVAILABLE", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_DEVICE_NOT_AVAILABLE", sub);
             break;
         case CL_COMPILER_NOT_AVAILABLE:
-            sprintf(err, "OpenCL error%s: CL_COMPILER_NOT_AVAILABLE", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_COMPILER_NOT_AVAILABLE", sub);
             break;
         case CL_MEM_OBJECT_ALLOCATION_FAILURE:
-            sprintf(err, "OpenCL error%s: CL_MEM_OBJECT_ALLOCATION_FAILURE", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_MEM_OBJECT_ALLOCATION_FAILURE", sub);
             break;
         case CL_OUT_OF_RESOURCES:
-            sprintf(err, "OpenCL error%s: CL_OUT_OF_RESOURCES", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_OUT_OF_RESOURCES", sub);
             break;
         case CL_OUT_OF_HOST_MEMORY:
-            sprintf(err, "OpenCL error%s: CL_OUT_OF_HOST_MEMORY", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_OUT_OF_HOST_MEMORY", sub);
             break;
         case CL_PROFILING_INFO_NOT_AVAILABLE:
-            sprintf(err, "OpenCL error%s: CL_PROFILING_INFO_NOT_AVAILABLE", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_PROFILING_INFO_NOT_AVAILABLE", sub);
             break;
         case CL_MEM_COPY_OVERLAP:
-            sprintf(err, "OpenCL error%s: CL_MEM_COPY_OVERLAP", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_MEM_COPY_OVERLAP", sub);
             break;
         case CL_IMAGE_FORMAT_MISMATCH:
-            sprintf(err, "OpenCL error%s: CL_IMAGE_FORMAT_MISMATCH", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_IMAGE_FORMAT_MISMATCH", sub);
             break;
         case CL_IMAGE_FORMAT_NOT_SUPPORTED:
-            sprintf(err, "OpenCL error%s: CL_IMAGE_FORMAT_NOT_SUPPORTED", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_IMAGE_FORMAT_NOT_SUPPORTED", sub);
             break;
         case CL_BUILD_PROGRAM_FAILURE:
-            sprintf(err, "OpenCL error%s: CL_BUILD_PROGRAM_FAILURE", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_BUILD_PROGRAM_FAILURE", sub);
             break;
         case CL_MAP_FAILURE:
-            sprintf(err, "OpenCL error%s: CL_MAP_FAILURE", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_MAP_FAILURE", sub);
             break;
         case CL_MISALIGNED_SUB_BUFFER_OFFSET:
-            sprintf(err, "OpenCL error%s: CL_MISALIGNED_SUB_BUFFER_OFFSET", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_MISALIGNED_SUB_BUFFER_OFFSET", sub);
             break;
         case CL_EXEC_STATUS_ERROR_FOR_EVENTS_IN_WAIT_LIST:
-            sprintf(err, "OpenCL error%s: CL_EXEC_STATUS_ERROR_FOR_EVENTS_IN_WAIT_LIST", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_EXEC_STATUS_ERROR_FOR_EVENTS_IN_WAIT_LIST", sub);
             break;
         case CL_INVALID_VALUE:
-            sprintf(err, "OpenCL error%s: CL_INVALID_VALUE", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_VALUE", sub);
             break;
         case CL_INVALID_DEVICE_TYPE:
-            sprintf(err, "OpenCL error%s: CL_INVALID_DEVICE_TYPE", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_DEVICE_TYPE", sub);
             break;
         case CL_INVALID_PLATFORM:
-            sprintf(err, "OpenCL error%s: CL_INVALID_PLATFORM", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_PLATFORM", sub);
             break;
         case CL_INVALID_DEVICE:
-            sprintf(err, "OpenCL error%s: CL_INVALID_DEVICE", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_DEVICE", sub);
             break;
         case CL_INVALID_CONTEXT:
-            sprintf(err, "OpenCL error%s: CL_INVALID_CONTEXT", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_CONTEXT", sub);
             break;
         case CL_INVALID_QUEUE_PROPERTIES:
-            sprintf(err, "OpenCL error%s: CL_INVALID_QUEUE_PROPERTIES", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_QUEUE_PROPERTIES", sub);
             break;
         case CL_INVALID_COMMAND_QUEUE:
-            sprintf(err, "OpenCL error%s: CL_INVALID_COMMAND_QUEUE", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_COMMAND_QUEUE", sub);
             break;
         case CL_INVALID_HOST_PTR:
-            sprintf(err, "OpenCL error%s: CL_INVALID_HOST_PTR", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_HOST_PTR", sub);
             break;
         case CL_INVALID_MEM_OBJECT:
-            sprintf(err, "OpenCL error%s: CL_INVALID_MEM_OBJECT", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_MEM_OBJECT", sub);
             break;
         case CL_INVALID_IMAGE_FORMAT_DESCRIPTOR:
-            sprintf(err, "OpenCL error%s: CL_INVALID_IMAGE_FORMAT_DESCRIPTOR", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_IMAGE_FORMAT_DESCRIPTOR", sub);
             break;
         case CL_INVALID_IMAGE_SIZE:
-            sprintf(err, "OpenCL error%s: CL_INVALID_IMAGE_SIZE", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_IMAGE_SIZE", sub);
             break;
         case CL_INVALID_SAMPLER:
-            sprintf(err, "OpenCL error%s: CL_INVALID_SAMPLER", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_SAMPLER", sub);
             break;
         case CL_INVALID_BINARY:
-            sprintf(err, "OpenCL error%s: CL_INVALID_BINARY", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_BINARY", sub);
             break;
         case CL_INVALID_BUILD_OPTIONS:
-            sprintf(err, "OpenCL error%s: CL_INVALID_BUILD_OPTIONS", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_BUILD_OPTIONS", sub);
             break;
         case CL_INVALID_PROGRAM:
-            sprintf(err, "OpenCL error%s: CL_INVALID_PROGRAM", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_PROGRAM", sub);
             break;
         case CL_INVALID_PROGRAM_EXECUTABLE:
-            sprintf(err, "OpenCL error%s: CL_INVALID_PROGRAM_EXECUTABLE", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_PROGRAM_EXECUTABLE", sub);
             break;
         case CL_INVALID_KERNEL_NAME:
-            sprintf(err, "OpenCL error%s: CL_INVALID_KERNEL_NAME", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_KERNEL_NAME", sub);
             break;
         case CL_INVALID_KERNEL_DEFINITION:
-            sprintf(err, "OpenCL error%s: CL_INVALID_KERNEL_DEFINITION", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_KERNEL_DEFINITION", sub);
             break;
         case CL_INVALID_KERNEL:
-            sprintf(err, "OpenCL error%s: CL_INVALID_KERNEL", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_KERNEL", sub);
             break;
         case CL_INVALID_ARG_INDEX:
-            sprintf(err, "OpenCL error%s: CL_INVALID_ARG_INDEX", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_ARG_INDEX", sub);
             break;
         case CL_INVALID_ARG_VALUE:
-            sprintf(err, "OpenCL error%s: CL_INVALID_ARG_VALUE", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_ARG_VALUE", sub);
             break;
         case CL_INVALID_ARG_SIZE:
-            sprintf(err, "OpenCL error%s: CL_INVALID_ARG_SIZE", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_ARG_SIZE", sub);
             break;
         case CL_INVALID_KERNEL_ARGS:
-            sprintf(err, "OpenCL error%s: CL_INVALID_KERNEL_ARGS", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_KERNEL_ARGS", sub);
             break;
         case CL_INVALID_WORK_DIMENSION:
-            sprintf(err, "OpenCL error%s: CL_INVALID_WORK_DIMENSION", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_WORK_DIMENSION", sub);
             break;
         case CL_INVALID_WORK_GROUP_SIZE:
-            sprintf(err, "OpenCL error%s: CL_INVALID_WORK_GROUP_SIZE", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_WORK_GROUP_SIZE", sub);
             break;
         case CL_INVALID_WORK_ITEM_SIZE:
-            sprintf(err, "OpenCL error%s: CL_INVALID_WORK_ITEM_SIZE", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_WORK_ITEM_SIZE", sub);
             break;
         case CL_INVALID_GLOBAL_OFFSET:
-            sprintf(err, "OpenCL error%s: CL_INVALID_GLOBAL_OFFSET", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_GLOBAL_OFFSET", sub);
             break;
         case CL_INVALID_EVENT_WAIT_LIST:
-            sprintf(err, "OpenCL error%s: CL_INVALID_EVENT_WAIT_LIST", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_EVENT_WAIT_LIST", sub);
             break;
         case CL_INVALID_EVENT:
-            sprintf(err, "OpenCL error%s: CL_INVALID_EVENT", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_EVENT", sub);
             break;
         case CL_INVALID_OPERATION:
-            sprintf(err, "OpenCL error%s: CL_INVALID_OPERATION", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_OPERATION", sub);
             break;
         case CL_INVALID_GL_OBJECT:
-            sprintf(err, "OpenCL error%s: CL_INVALID_GL_OBJECT", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_GL_OBJECT", sub);
             break;
         case CL_INVALID_BUFFER_SIZE:
-            sprintf(err, "OpenCL error%s: CL_INVALID_BUFFER_SIZE", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_BUFFER_SIZE", sub);
             break;
         case CL_INVALID_MIP_LEVEL:
-            sprintf(err, "OpenCL error%s: CL_INVALID_MIP_LEVEL", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_MIP_LEVEL", sub);
             break;
         case CL_INVALID_GLOBAL_WORK_SIZE:
-            sprintf(err, "OpenCL error%s: CL_INVALID_GLOBAL_WORK_SIZE", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_GLOBAL_WORK_SIZE", sub);
             break;
         case CL_INVALID_PROPERTY:
-            sprintf(err, "OpenCL error%s: CL_INVALID_PROPERTY", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_INVALID_PROPERTY", sub);
             break;
         // OpenCL 1.1 etc. codes can not be assumed to be defined
         // Might be good to have ifdefs or something
         // OpenCL extensions
         case -1001:     // CL_PLATFORM_NOT_FOUND_KHR
-            sprintf(err, "OpenCL error%s: CL_PLATFORM_NOT_FOUND_KHR", sub);
+            PyErr_Format(PyExc_Exception, "OpenCL error%s: CL_PLATFORM_NOT_FOUND_KHR", sub);
             break;
         // Unknown error
         default:
-            sprintf(err, "Unknown OpenCL error%s: %i", sub, (int)flag);
+            PyErr_Format(PyExc_Exception, "Unknown OpenCL error%s: %i", sub, (int)flag);
             break;
     };
-    PyErr_SetString(PyExc_Exception, err);
     return 1;
 }
 

myokit/_sim/opencl.py

@@ -4,24 +4,14 @@
 # This file is part of Myokit.
 # See http://myokit.org for copyright, sharing, and licensing details.
 #
-from __future__ import absolute_import, division
-from __future__ import print_function, unicode_literals
-
+import configparser
 import os
-import myokit
-
-try:
-    # Python2
-    from ConfigParser import ConfigParser
-except ImportError:
-    # Python 3
-    from configparser import RawConfigParser as ConfigParser
 
+import myokit
 
 # Settings file
 SETTINGS_FILE = os.path.join(myokit.DIR_USER, 'preferred-opencl-device.ini')
 
-
 # Location of C source for OpenCL info module
 SOURCE_FILE = 'opencl.c'
 
@@ -41,7 +31,7 @@ class OpenCL(myokit.CModule):
     _message = None
 
     def __init__(self):
-        super(OpenCL, self).__init__()
+        super().__init__()
         # Create back-end and cache it
         OpenCL._index += 1
         mname = 'myokit_opencl_info_' + str(OpenCL._index)
@@ -165,11 +155,8 @@ class OpenCL(myokit.CModule):
         # Read ini file
         inifile = os.path.expanduser(SETTINGS_FILE)
         if os.path.isfile(inifile):
-            config = ConfigParser()
-            try:
-                config.read(inifile, encoding='ascii')  # Python 3
-            except TypeError:   # pragma: no python 3 cover
-                config.read(inifile)
+            config = configparser.RawConfigParser()
+            config.read(inifile, encoding='ascii')
 
             def get(section, option):
                 x = None
@@ -205,7 +192,7 @@ class OpenCL(myokit.CModule):
             device = device.encode('ascii').decode('ascii')
 
         # Create configuration
-        config = ConfigParser()
+        config = configparser.RawConfigParser()
         config.add_section('selection')
         if platform:
             config.set('selection', 'platform', platform)
@@ -271,7 +258,7 @@ class OpenCL(myokit.CModule):
     '''
 
 
-class OpenCLInfo(object):
+class OpenCLInfo:
     """
     Represents information about the available OpenCL platforms and devices.
 
@@ -299,7 +286,7 @@ class OpenCLInfo(object):
         return '\n'.join(b)
 
 
-class OpenCLPlatformInfo(object):
+class OpenCLPlatformInfo:
     """
     Represents information about an OpenCL platform.
 
@@ -376,7 +363,7 @@ class OpenCLPlatformInfo(object):
         return extension in self.extensions
 
 
-class OpenCLDeviceInfo(object):
+class OpenCLDeviceInfo:
     """
     Represents information about an OpenCL device.
 

myokit/_sim/openclsim.c

@@ -515,9 +515,7 @@ sim_init(PyObject* self, PyObject* args)
     for(i=0; i<nx * ny * n_state; i++) {
         flt = PyList_GetItem(state_in, (Py_ssize_t)i);    // Don't decref!
         if(!PyFloat_Check(flt)) {
-            char errstr[200];
-            sprintf(errstr, "Item %u in state vector is not a float.", (unsigned int)i);
-            PyErr_SetString(PyExc_Exception, errstr);
+            PyErr_Format(PyExc_Exception, "Item %u in state vector is not a float.", (unsigned int)i);
             return sim_clean();
         }
         rvec_state[i] = (Real)PyFloat_AsDouble(flt);
@@ -552,9 +550,7 @@ sim_init(PyObject* self, PyObject* args)
         for(i=0; i<n_field_data; i++) {
             flt = PyList_GetItem(field_data, (Py_ssize_t)i);    // No need to decref
             if(!PyFloat_Check(flt)) {
-                char errstr[200];
-                sprintf(errstr, "Item %u in field data is not a float.", (unsigned int)i);
-                PyErr_SetString(PyExc_Exception, errstr);
+                PyErr_Format(PyExc_Exception, "Item %u in field data is not a float.", (unsigned int)i);
                 return sim_clean();
             }
             rvec_field_data[i] = (Real)PyFloat_AsDouble(flt);

myokit/_sim/openclsim.py

@@ -5,15 +5,15 @@
 # This file is part of Myokit.
 # See http://myokit.org for copyright, sharing, and licensing details.
 #
-from __future__ import absolute_import, division
-from __future__ import print_function, unicode_literals
-
 import os
-import myokit
-import numpy as np
 import platform
+
 from collections import OrderedDict
 
+import numpy as np
+
+import myokit
+
 
 # Location of C and OpenCL sources
 SOURCE_FILE = 'openclsim.c'
@@ -148,7 +148,7 @@ class SimulationOpenCL(myokit.CModule):
     def __init__(
             self, model, protocol=None, ncells=256, diffusion=True,
             precision=myokit.SINGLE_PRECISION, native_maths=False, rl=False):
-        super(SimulationOpenCL, self).__init__()
+        super().__init__()
 
         # Require a valid model
         if not model.is_valid():

myokit/_sim/pacing.h

@@ -353,9 +353,7 @@ ESys_Populate(ESys sys, PyObject* protocol)
     if (protocol != Py_None) {
 
         // Get PyList from protocol (will need to decref!)
-        // Cast to (char*) happens because CallMethod accepts a mutable char*
-        // This should have been const char* and has been fixed in python 3
-        PyObject* list = PyObject_CallMethod(protocol, (char*)"events", NULL); // Returns a new reference
+        PyObject* list = PyObject_CallMethod(protocol, "events", NULL); // Returns a new reference
         if(list == NULL) return ESys_POPULATE_INVALID_PROTOCOL;
         if(!PyList_Check(list)) {
             Py_DECREF(list);
@@ -766,9 +764,7 @@ FSys_Populate(FSys sys, PyObject* protocol)
     if (protocol == Py_None) return FSys_POPULATE_INVALID_PROTOCOL;
 
     // Get PyList from protocol (will need to decref!)
-    // Cast to (char*) happens because CallMethod accepts a mutable char*
-    // This should have been const char* and has been fixed in python 3
-    times_list = PyObject_CallMethod(protocol, (char*)"times", NULL); // Returns a new reference
+    times_list = PyObject_CallMethod(protocol, "times", NULL); // Returns a new reference
     if(times_list == NULL) return FSys_POPULATE_INVALID_PROTOCOL;
     if(!PyList_Check(times_list)) {
         Py_DECREF(times_list);

myokit/_sim/rhs.c

@@ -135,15 +135,12 @@ log_extract(PyObject* data, const char* name, const int position, double* var)
     PyObject* key;
     PyObject* list;
     PyObject* item;
-    char errstr[1000];
 
     // Get sequence from dict
     key = PyUnicode_FromString(name);
     if (!PyDict_Contains(data, key)) {
         Py_DECREF(key);
-        // Raise exception
-        sprintf(errstr, "Variable %s not found in log.", name);
-        PyErr_SetString(PyExc_Exception, errstr);
+        PyErr_Format(PyExc_Exception, "Variable %s not found in log.", name);
         return 0;
     }
     list = PyDict_GetItem(data, key); // Borrowed ref, don't decref
@@ -154,9 +151,7 @@ log_extract(PyObject* data, const char* name, const int position, double* var)
     item = PySequence_GetItem(list, position); // New reference, decref
     if (item == NULL) {
         Py_DECREF(key);
-        // Raise exception
-        sprintf(errstr, "No item found at position %i of log for %s.", position, name);
-        PyErr_SetString(PyExc_Exception, errstr);
+        PyErr_Format(PyExc_Exception, "No item found at position %i of log for %s.", position, name);
         return 0;
     }
     Py_DECREF(key);
@@ -164,9 +159,7 @@ log_extract(PyObject* data, const char* name, const int position, double* var)
     // Get double from float
     if (!PyFloat_Check(item)) {
         Py_XDECREF(item);
-        // Raise exception
-        sprintf(errstr, "Log for %s can only contain floats (error at index %i).", name, position);
-        PyErr_SetString(PyExc_Exception, errstr);
+        PyErr_Format(PyExc_Exception, "Log for %s can only contain floats (error at index %i).", name, position);
         return 0;
     }
 

myokit/_sim/rhs.py

@@ -4,20 +4,11 @@
 # This file is part of Myokit.
 # See http://myokit.org for copyright, sharing, and licensing details.
 #
-from __future__ import absolute_import, division
-from __future__ import print_function, unicode_literals
-
 import os
-import timeit
-import myokit
 import platform
+import timeit
 
-# Strings in Python 2 and 3
-try:
-    basestring
-except NameError:   # pragma: no cover
-    basestring = str
-
+import myokit
 
 # Location of C source file
 SOURCE_FILE = 'rhs.c'
@@ -42,7 +33,7 @@ class RhsBenchmarker(myokit.CModule):
     _index = 0  # Unique id for the generated module
 
     def __init__(self, model, variables=None, exclude_selected=False):
-        super(RhsBenchmarker, self).__init__()
+        super().__init__()
 
         # Require a valid model
         model.validate()
@@ -201,7 +192,7 @@ class RhsBenchmarker(myokit.CModule):
         else:
             self._variables = set()
             for var in variables:
-                if isinstance(var, basestring):
+                if isinstance(var, str):
                     # String? Then get variable from model
                     var = self._model.get(var)
                 else:

myokit/_sim/sundials.py

@@ -4,9 +4,6 @@
 # This file is part of Myokit.
 # See http://myokit.org for copyright, sharing, and licensing details.
 #
-from __future__ import absolute_import, division
-from __future__ import print_function, unicode_literals
-
 import os
 
 import myokit
@@ -32,7 +29,7 @@ class Sundials(myokit.CModule):
     _version = None
 
     def __init__(self):
-        super(Sundials, self).__init__()
+        super().__init__()
         # Create and cache back-end
         Sundials._index += 1
 

myokit/_system.py

@@ -4,13 +4,10 @@
 # This file is part of Myokit.
 # See http://myokit.org for copyright, sharing, and licensing details.
 #
-from __future__ import absolute_import, division
-from __future__ import print_function, unicode_literals
-
+import importlib
 import os
-import sys
 import platform
-import importlib
+import sys
 
 import myokit
 
@@ -28,7 +25,7 @@ def system(live_printing=False):
         out = []
     else:
         # Create fake list interface that just prints
-        class Out(object):
+        class Out:
             def append(self, x):
                 print(x)
 
@@ -68,25 +65,22 @@ def system(live_printing=False):
     out.append('== GUI ==')
 
     try:    # pragma: no cover
-        from PyQt5.QtCore import QT_VERSION_STR
-        out.append('PyQt5: ' + QT_VERSION_STR)
+        from PyQt6.QtCore import QT_VERSION_STR
+        out.append('PyQt6: ' + QT_VERSION_STR)
         out.append('  Sip: ' + _module_version('sip'))
         del QT_VERSION_STR
     except ImportError:
-        out.append('PyQt5: Not found')
+        out.append('PyQt6: Not found')
 
     try:    # pragma: no cover
-        from PyQt4.QtCore import QT_VERSION_STR
-        out.append('PyQt4: ' + QT_VERSION_STR)
+        from PyQt5.QtCore import QT_VERSION_STR
+        out.append('PyQt5: ' + QT_VERSION_STR)
         out.append('  Sip: ' + _module_version('sip'))
         del QT_VERSION_STR
     except ImportError:
-        out.append('PyQt4: Not found')
-    except RuntimeError:    # pragma: no cover
-        # Happens if PyQt5 was also found
-        out.append('PyQt4: OK')
+        out.append('PyQt5: Not found')
 
-    out.append('PySide: ' + _module_version('PySide'))
+    out.append('PySide6: ' + _module_version('PySide6'))
     out.append('PySide2: ' + _module_version('PySide2'))
     out.append('')
 

myokit/_unit.py

@@ -5,21 +5,12 @@
 # This file is part of Myokit.
 # See http://myokit.org for copyright, sharing, and licensing details.
 #
-from __future__ import absolute_import, division
-from __future__ import print_function, unicode_literals
-
 import math
 
 import myokit
 
-# Strings in Python 2 and 3
-try:
-    basestring
-except NameError:   # pragma: no python 2 cover
-    basestring = str
-
 
-class Unit(object):
+class Unit:
     """
     Represents a unit.
 
@@ -522,7 +513,7 @@ class Unit(object):
             preferred representation format.
 
         """
-        if not isinstance(name, basestring):
+        if not isinstance(name, str):
             raise TypeError('Given name must be a string.')
         if not isinstance(unit, Unit):
             raise TypeError('Given unit must be myokit.Unit')
@@ -679,7 +670,7 @@ class Unit(object):
             self._m - other._m)
 
 
-class Quantity(object):
+class Quantity:
     """
     Represents a quantity with a :class:`unit <myokit.Unit>`. Can be used to
     perform unit-safe arithmetic.

myokit/float.py

@@ -4,9 +4,6 @@
 # This file is part of Myokit.
 # See http://myokit.org for copyright, sharing, and licensing details.
 #
-from __future__ import absolute_import, division
-from __future__ import print_function, unicode_literals
-
 import sys
 
 import myokit

myokit/formats/__init__.py

@@ -4,15 +4,13 @@
 # This file is part of Myokit.
 # See http://myokit.org for copyright, sharing, and licensing details.
 #
-from __future__ import absolute_import, division
-from __future__ import print_function, unicode_literals
-
-import myokit
 import os
 import sys
 import traceback
 import warnings
 
+import myokit
+
 # Constants
 DIR_FORMATS = os.path.join(myokit.DIR_MYOKIT, 'formats')
 
@@ -23,12 +21,12 @@ _EWRITERS = None
 
 
 # Classes & methods
-class Exporter(object):
+class Exporter:
     """
     Abstract base class for exporters.
     """
     def __init__(self):
-        super(Exporter, self).__init__()
+        super().__init__()
 
     def post_export_info(self):
         """
@@ -106,7 +104,7 @@ def exporters():
     return sorted(_EXPORTERS.keys())
 
 
-class ExpressionWriter(object):
+class ExpressionWriter:
     """
     Base class for expression writers, that take myokit expressions as input
     and convert them to text or other formats.
@@ -322,12 +320,12 @@ def ewriters():
     return sorted(_EWRITERS.keys())
 
 
-class Importer(object):
+class Importer:
     """
     Abstract base class for importers.
     """
     def __init__(self):
-        super(Importer, self).__init__()
+        super().__init__()
 
     def component(self, path, model):
         """
@@ -411,7 +409,7 @@ class TemplatedRunnableExporter(Exporter):
     protocol) into a runnable chunk of code.
     """
     def __init__(self):
-        super(TemplatedRunnableExporter, self).__init__()
+        super().__init__()
 
     def runnable(self, path, model, protocol=None, *args):
         """