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

myokit/_config.py

@@ -5,27 +5,18 @@
 # 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
-
-# Load Myokit, at least, the bit that's been setup so far. This just means
-# this method will add a link to the myokit module already being loaded
-# into this method's namespace. This allows us to use the constants defined
-# before this method was called.
-import myokit
-
-# Load standard library modules
+import configparser
 import logging
 import os
 import platform
 import sys
 import warnings
 
-# ConfigParser in Python 2 and 3
-try:
-    from ConfigParser import ConfigParser
-except ImportError:
-    from configparser import RawConfigParser as ConfigParser
+# Load Myokit, at least, the bit that's been setup so far. This just means
+# this method will add a link to the myokit module already being loaded
+# into this method's namespace. This allows us to use the constants defined
+# before this method was called.
+import myokit
 
 
 def _create(path):
@@ -37,7 +28,7 @@ def _create(path):
     system = platform.system()
 
     # Create config parser
-    config = ConfigParser(allow_no_value=True)
+    config = configparser.RawConfigParser(allow_no_value=True)
 
     # Make the parser case sensitive (need for unix paths!)
     config.optionxform = str
@@ -71,12 +62,12 @@ def _create(path):
     # GUI Backend
     config.add_section('gui')
     config.set('gui', '# Backend to use for graphical user interface.')
-    config.set('gui', '# Valid options are pyqt5, pyqt4, pyside2 and pyside.')
+    config.set('gui', '# Valid options are pyqt6, pyqt5, pyside6 and pyside2.')
     config.set('gui', '# Leave unset for automatic selection.')
+    config.set('gui', '#backend = pyqt6')
     config.set('gui', '#backend = pyqt5')
-    config.set('gui', '#backend = pyqt4')
+    config.set('gui', '#backend = pyside6')
     config.set('gui', '#backend = pyside2')
-    config.set('gui', '#backend = pyside')
 
     # Locations of sundials library
     config.add_section('sundials')
@@ -223,7 +214,7 @@ def _load():
         del lines, inline_comment
 
     # Create the config parser (no value allows comments)
-    config = ConfigParser(allow_no_value=True)
+    config = configparser.RawConfigParser(allow_no_value=True)
 
     # Make the parser case sensitive (need for unix paths!)
     config.optionxform = str
@@ -270,30 +261,30 @@ def _load():
     # GUI Backend
     if config.has_option('gui', 'backend'):
         x = config.get('gui', 'backend').strip().lower()
-        if x == 'pyqt' or x == 'pyqt4':
-            myokit.FORCE_PYQT4 = True
+        if x == 'pyqt6':
+            myokit.FORCE_PYQT6 = True
             myokit.FORCE_PYQT5 = False
-            myokit.FORCE_PYSIDE = False
+            myokit.FORCE_PYSIDE6 = False
             myokit.FORCE_PYSIDE2 = False
         elif x == 'pyqt5':
-            myokit.FORCE_PYQT4 = False
+            myokit.FORCE_PYQT6 = False
             myokit.FORCE_PYQT5 = True
-            myokit.FORCE_PYSIDE = False
+            myokit.FORCE_PYSIDE6 = False
             myokit.FORCE_PYSIDE2 = False
-        elif x == 'pyside':
-            myokit.FORCE_PYQT4 = False
+        elif x == 'pyside6':
+            myokit.FORCE_PYQT6 = False
             myokit.FORCE_PYQT5 = False
-            myokit.FORCE_PYSIDE = True
+            myokit.FORCE_PYSIDE6 = True
             myokit.FORCE_PYSIDE2 = False
         elif x == 'pyside2':
-            myokit.FORCE_PYQT4 = False
+            myokit.FORCE_PYQT6 = False
             myokit.FORCE_PYQT5 = False
-            myokit.FORCE_PYSIDE = False
+            myokit.FORCE_PYSIDE6 = False
             myokit.FORCE_PYSIDE2 = True
         elif x != '':
             warnings.warn(
                 'Invalid setting in myokit.ini. Expected values for backend'
-                ' are pyqt, pyqt4, pyqt5, pyside, or pyside2. Got: ' + x)
+                ' are pyqt6, pyqt5, pyside6, or pyside2. Got: ' + x)
 
     # Sundials libraries, header files, and version
     if config.has_option('sundials', 'lib'):

myokit/_datablock.py

@@ -4,15 +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 array
 import os
 import sys
-import array
-import numpy as np
+
 import myokit
 
+import numpy as np
+
 
 # Readme file for DataBlock1d binary files
 README_SAVE_1D = """
@@ -85,7 +84,7 @@ header, and little-endian:
 ENC = 'utf-8'
 
 
-class DataBlock1d(object):
+class DataBlock1d:
     """
     Container for time-series of 1d rectangular data arrays.
 
@@ -187,8 +186,8 @@ class DataBlock1d(object):
                     ' of cells.')
 
         # Get indices of selected cells
-        ilo = border                # First indice
-        ihi = self._nx - border     # Last indice + 1
+        ilo = border                # First index
+        ihi = self._nx - border     # Last index + 1
 
         # Indices of cells with AP
         i1 = None
@@ -205,8 +204,8 @@ class DataBlock1d(object):
         t = []
         for i in range(ilo, ihi):
             v = v_series[i]
-            # Get indice of first threshold crossing with positive flank
-            # Don't include crossings at log indice 0
+            # Get index of first threshold crossing with positive flank
+            # Don't include crossings at log index 0
             itime = np.where((v[1:] > -30) & (v[1:] - v[:-1] > 0))[0]
             if len(itime) == 0 or itime[0] == 0:
                 # No crossing found
@@ -476,17 +475,10 @@ class DataBlock1d(object):
                 'This method requires the ``zlib`` module to be installed.')
 
         # Get size of single and double types on this machine
-        try:
-            dsize = {
-                'd': len(array.array('d', [1]).tobytes()),
-                'f': len(array.array('f', [1]).tobytes()),
-            }
-        except (AttributeError, TypeError):  # pragma: no python 3 cover
-            # List dtype as str for Python 2.7.10 (see #225)
-            dsize = {
-                b'd': len(array.array(b'd', [1]).tostring()),
-                b'f': len(array.array(b'f', [1]).tostring()),
-            }
+        dsize = {
+            'd': len(array.array('d', [1]).tobytes()),
+            'f': len(array.array('f', [1]).tobytes()),
+        }
 
         # Read data from file
         try:
@@ -544,8 +536,6 @@ class DataBlock1d(object):
             nt = int(next(head))
             nx = int(next(head))
             dtype = next(head)[1:-1]
-            # Convert dtype to str for Python 2.7.10 (see #225)
-            dtype = str(dtype)
             if dtype not in dsize:
                 raise myokit.DataBlockReadError(
                     'Unable to read DataBlock1d: Unrecognized data type "'
@@ -573,10 +563,7 @@ class DataBlock1d(object):
                     'Unable to read DataBlock1d: Header indicates larger data'
                     ' than found in the body.')
             data = array.array(dtype)
-            try:
-                data.frombytes(body[start:end])
-            except AttributeError:  # pragma: no python 3 cover
-                data.fromstring(body[start:end])
+            data.frombytes(body[start:end])
             if sys.byteorder == 'big':  # pragma: no cover
                 data.byteswap()
             data = np.array(data)
@@ -597,10 +584,7 @@ class DataBlock1d(object):
                         'Unable to read DataBlock1d: Header indicates larger'
                         ' data than found in the body.')
                 data = array.array(dtype)
-                try:
-                    data.frombytes(body[start:end])
-                except AttributeError:  # pragma: no python 3 cover
-                    data.fromstring(body[start:end])
+                data.frombytes(body[start:end])
                 if sys.byteorder == 'big':  # pragma: no cover
                     data.byteswap()
                 data = np.array(data)
@@ -619,10 +603,7 @@ class DataBlock1d(object):
                         'Unable to read DataBlock1d: Header indicates larger'
                         ' data than found in the body.')
                 data = array.array(dtype)
-                try:
-                    data.frombytes(body[start:end])
-                except AttributeError:  # pragma: no python 3 cover
-                    data.fromstring(body[start:end])
+                data.frombytes(body[start:end])
                 if sys.byteorder == 'big':  # pragma: no cover
                     data.byteswap()
                 data = np.array(data).reshape(nt, nx, order='C')
@@ -680,8 +661,7 @@ class DataBlock1d(object):
                 'This method requires the ``zlib`` module to be installed.')
 
         # Data type
-        # Create dtype as str for Python 2.7.10 (see #225)
-        dtype = str('d')     # Only supporting doubles right now
+        dtype = 'd'     # Only supporting doubles right now
 
         # Create header
         head_str = []
@@ -706,10 +686,7 @@ class DataBlock1d(object):
         if sys.byteorder == 'big':  # pragma: no cover
             for ar in body_str:
                 ar.byteswap()
-        try:
-            body_str = b''.join([ar.tobytes() for ar in body_str])
-        except AttributeError:  # pragma: no python 3 cover
-            body_str = b''.join([ar.tostring() for ar in body_str])
+        body_str = b''.join([ar.tobytes() for ar in body_str])
 
         # Write
         head = zipfile.ZipInfo('header_block1d.txt')
@@ -803,7 +780,7 @@ class DataBlock1d(object):
         return self._1d[variable][:, x]
 
 
-class DataBlock2d(object):
+class DataBlock2d:
     """
     Container for time-series of 2d rectangular data arrays.
 
@@ -1274,17 +1251,10 @@ class DataBlock2d(object):
                 'This method requires the ``zlib`` module to be installed.')
 
         # Get size of single and double types on this machine
-        try:
-            dsize = {
-                'd': len(array.array('d', [1]).tobytes()),
-                'f': len(array.array('f', [1]).tobytes()),
-            }
-        except (AttributeError, TypeError):  # pragma: no python 3 cover
-            # List dtype as str for Python 2.7.10 (see #225)
-            dsize = {
-                b'd': len(array.array(b'd', [1]).tostring()),
-                b'f': len(array.array(b'f', [1]).tostring()),
-            }
+        dsize = {
+            'd': len(array.array('d', [1]).tobytes()),
+            'f': len(array.array('f', [1]).tobytes()),
+        }
 
         # Read data from file
         try:
@@ -1353,8 +1323,7 @@ class DataBlock2d(object):
             nx = int(next(head))
 
             # Get dtype
-            # Convert dtype to str for Python 2.7.10 (see #225)
-            dtype = str(next(head))[1:-1]
+            dtype = next(head)[1:-1]
             if dtype not in dsize:
                 raise myokit.DataBlockReadError(
                     'Unable to read DataBlock2d: Unrecognized data type "'
@@ -1384,10 +1353,7 @@ class DataBlock2d(object):
                     ' than found in the body.')
 
             data = array.array(dtype)
-            try:
-                data.frombytes(body[start:end])
-            except AttributeError:  # pragma: no python 3 cover
-                data.fromstring(body[start:end])
+            data.frombytes(body[start:end])
             if sys.byteorder == 'big':  # pragma: no cover
                 data.byteswap()
             data = np.array(data)
@@ -1408,10 +1374,7 @@ class DataBlock2d(object):
                         'Unable to read DataBlock2d: Header indicates larger'
                         ' data than found in the body.')
                 data = array.array(dtype)
-                try:
-                    data.frombytes(body[start:end])
-                except AttributeError:  # pragma: no python 3 cover
-                    data.fromstring(body[start:end])
+                data.frombytes(body[start:end])
                 if sys.byteorder == 'big':  # pragma: no cover
                     data.byteswap()
                 data = np.array(data)
@@ -1430,10 +1393,7 @@ class DataBlock2d(object):
                         'Unable to read DataBlock2d: Header indicates larger'
                         ' data than found in the body.')
                 data = array.array(dtype)
-                try:
-                    data.frombytes(body[start:end])
-                except AttributeError:  # pragma: no python 3 cover
-                    data.fromstring(body[start:end])
+                data.frombytes(body[start:end])
                 if sys.byteorder == 'big':  # pragma: no cover
                     data.byteswap()
                 data = np.array(data).reshape(nt, ny, nx, order='C')
@@ -1496,8 +1456,7 @@ class DataBlock2d(object):
                 'This method requires the ``zlib`` module to be installed.')
 
         # Data type
-        # Create dtype as str for Python 2.7.10 (see #225)
-        dtype = str('d')  # Only supporting doubles right now
+        dtype = 'd'     # Only supporting doubles right now
 
         # Create header
         head_str = []
@@ -1523,10 +1482,7 @@ class DataBlock2d(object):
         if sys.byteorder == 'big':  # pragma: no cover
             for ar in body_str:
                 ar.byteswap()
-        try:
-            body_str = b''.join([ar.tobytes() for ar in body_str])
-        except AttributeError:  # pragma: no python 3 cover
-            body_str = b''.join([ar.tostring() for ar in body_str])
+        body_str = b''.join([ar.tobytes() for ar in body_str])
 
         # Write
         head = zipfile.ZipInfo('header_block2d.txt')
@@ -1671,7 +1627,7 @@ class DataBlock2d(object):
         return self._2d[variable][:, y, x]
 
 
-class ColorMap(object):
+class ColorMap:
     """
     *Abstract class*