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

myokit/tests/test_compiler_detection.py

@@ -5,28 +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
-
 import unittest
 
 import myokit
 
 
-# Strings in Python2 and Python3
-try:
-    basestring
-except NameError:   # pragma: no cover
-    basestring = str
-
-
 class CompilerDetectionTest(unittest.TestCase):
     """
     Tests the compiler detection.
     """
     def test_compiler(self):
         # Test the compiler detection.
-        self.assertIsInstance(myokit.Compiler.info(), basestring)
+        self.assertIsInstance(myokit.Compiler.info(), str)
 
 
 if __name__ == '__main__':

myokit/tests/test_component.py

@@ -5,20 +5,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 myokit
 import unittest
 
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
-
 class VarOwnerTest(unittest.TestCase):
     """
     Tests parts of :class:`myokit.VarOwner`.

myokit/tests/test_config.py

@@ -5,9 +5,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 sys
 import unittest
@@ -16,7 +13,6 @@ import myokit
 
 from myokit.tests import TemporaryDirectory, WarningCollector
 
-
 debug = False
 
 
@@ -44,7 +40,7 @@ str=String value
 """
 
 # Config with empty paths and spaces
-config_paths_1 = """
+config_paths = """
 [sundials]
 lib = five
 inc = three;four;
@@ -53,16 +49,6 @@ lib = one;;   two point five;three;
 inc =
 """
 
-# Config with empty paths and " ;", which in Python 2 is ignored
-config_paths_2 = """
-[sundials]
-lib = five ; six
-inc = three;four;
-[opencl]
-lib = one ;;   two point five ;three;
-inc =
-"""
-
 
 class TestConfig(unittest.TestCase):
 
@@ -82,10 +68,10 @@ class TestConfig(unittest.TestCase):
         cls._compat_no_fd_capture = myokit.COMPAT_NO_FD_CAPTURE
         cls._date_format = myokit.DATE_FORMAT
         cls._time_format = myokit.TIME_FORMAT
-        cls._force_pyside = myokit.FORCE_PYSIDE
-        cls._force_pyside2 = myokit.FORCE_PYSIDE2
-        cls._force_pyqt4 = myokit.FORCE_PYQT4
+        cls._force_pyqt6 = myokit.FORCE_PYQT6
         cls._force_pyqt5 = myokit.FORCE_PYQT5
+        cls._force_pyside6 = myokit.FORCE_PYSIDE6
+        cls._force_pyside2 = myokit.FORCE_PYSIDE2
         cls._sundials_lib = myokit.SUNDIALS_LIB
         cls._sundials_inc = myokit.SUNDIALS_INC
         cls._opencl_lib = myokit.OPENCL_LIB
@@ -114,10 +100,10 @@ class TestConfig(unittest.TestCase):
         myokit.COMPAT_NO_FD_CAPTURE = cls._compat_no_fd_capture
         myokit.DATE_FORMAT = cls._date_format
         myokit.TIME_FORMAT = cls._time_format
-        myokit.FORCE_PYSIDE = cls._force_pyside
-        myokit.FORCE_PYSIDE2 = cls._force_pyside2
-        myokit.FORCE_PYQT4 = cls._force_pyqt4
+        myokit.FORCE_PYQT6 = cls._force_pyqt6
         myokit.FORCE_PYQT5 = cls._force_pyqt5
+        myokit.FORCE_PYSIDE6 = cls._force_pyside6
+        myokit.FORCE_PYSIDE2 = cls._force_pyside2
         myokit.SUNDIALS_LIB = cls._sundials_lib
         myokit.SUNDIALS_INC = cls._sundials_inc
         myokit.OPENCL_LIB = cls._opencl_lib
@@ -131,10 +117,10 @@ class TestConfig(unittest.TestCase):
         assert myokit.COMPAT_NO_FD_CAPTURE == cls._compat_no_fd_capture
         assert myokit.DATE_FORMAT != 'TEST_DATE_FORMAT'
         assert myokit.TIME_FORMAT != 'TEST_TIME_FORMAT'
-        assert myokit.FORCE_PYSIDE == cls._force_pyside
-        assert myokit.FORCE_PYSIDE2 == cls._force_pyside2
-        assert myokit.FORCE_PYQT4 == cls._force_pyqt4
+        assert myokit.FORCE_PYQT6 == cls._force_pyqt6
         assert myokit.FORCE_PYQT5 == cls._force_pyqt5
+        assert myokit.FORCE_PYSIDE6 == cls._force_pyside6
+        assert myokit.FORCE_PYSIDE2 == cls._force_pyside2
         assert myokit.SUNDIALS_LIB != ['one', 'two']
         assert myokit.SUNDIALS_INC != ['three', 'four']
         assert myokit.OPENCL_LIB != ['five', 'six']
@@ -168,17 +154,17 @@ class TestConfig(unittest.TestCase):
         myokit.SUNDIALS_INC = []
         myokit.OPENCL_LIB = []
         myokit.OPENCL_INC = []
-        myokit.FORCE_PYSIDE = myokit.FORCE_PYSIDE2 = False
-        myokit.FORCE_PYQT4 = myokit.FORCE_PYQT5 = False
+        myokit.FORCE_PYSIDE6 = myokit.FORCE_PYSIDE2 = False
+        myokit.FORCE_PYQT6 = myokit.FORCE_PYQT5 = False
         with open(self._temp_dir.path('myokit.ini'), 'w') as f:
             f.write(config_basic)
         self._config_module._load()
         self.assertEqual(myokit.DATE_FORMAT, 'TEST_DATE_FORMAT')
         self.assertEqual(myokit.TIME_FORMAT, 'TEST_TIME_FORMAT')
-        self.assertFalse(myokit.FORCE_PYSIDE)
-        self.assertFalse(myokit.FORCE_PYSIDE2)
-        self.assertFalse(myokit.FORCE_PYQT4)
+        self.assertFalse(myokit.FORCE_PYQT6)
         self.assertFalse(myokit.FORCE_PYQT5)
+        self.assertFalse(myokit.FORCE_PYSIDE6)
+        self.assertFalse(myokit.FORCE_PYSIDE2)
         self.assertEqual(myokit.SUNDIALS_LIB, ['one', 'two'])
         self.assertEqual(myokit.SUNDIALS_INC, ['three', 'four'])
         self.assertEqual(myokit.OPENCL_LIB, ['five', 'six'])
@@ -205,7 +191,7 @@ class TestConfig(unittest.TestCase):
         myokit.OPENCL_LIB = []
         myokit.OPENCL_INC = []
         with open(self._temp_dir.path('myokit.ini'), 'w') as f:
-            f.write(config_paths_1)
+            f.write(config_paths)
         self._config_module._load()
         self.assertEqual(myokit.SUNDIALS_LIB, ['five'])
         self.assertEqual(myokit.SUNDIALS_INC, ['three', 'four'])
@@ -214,60 +200,41 @@ class TestConfig(unittest.TestCase):
             ['one', 'two point five', 'three'])
         self.assertEqual(myokit.OPENCL_INC, [])
 
-        # Even if the list contains " ;", which Python 2's config parser treats
-        # as a comment
-        myokit.SUNDIALS_LIB = []
-        myokit.SUNDIALS_INC = []
-        myokit.OPENCL_LIB = []
-        myokit.OPENCL_INC = []
-        with open(self._temp_dir.path('myokit.ini'), 'w') as f:
-            f.write(config_paths_2)
-        if sys.hexversion < 0x03020000:
-            self.assertRaises(ImportError, self._config_module._load)
-        else:
-            self._config_module._load()
-            self.assertEqual(myokit.SUNDIALS_LIB, ['five', 'six'])
-            self.assertEqual(myokit.SUNDIALS_INC, ['three', 'four'])
-            self.assertEqual(
-                myokit.OPENCL_LIB,
-                ['one', 'two point five', 'three'])
-            self.assertEqual(myokit.OPENCL_INC, [])
-
     def test_load_gui_backend(self):
         # Tests setting the GUI back end
 
         # Qt gui options
         with open(self._temp_dir.path('myokit.ini'), 'w') as f:
-            f.write('[gui]\nbackend=pyqt4\n')
+            f.write('[gui]\nbackend=pyqt6\n')
         self._config_module._load()
-        self.assertFalse(myokit.FORCE_PYSIDE)
-        self.assertFalse(myokit.FORCE_PYSIDE2)
-        self.assertTrue(myokit.FORCE_PYQT4)
+        self.assertTrue(myokit.FORCE_PYQT6)
         self.assertFalse(myokit.FORCE_PYQT5)
+        self.assertFalse(myokit.FORCE_PYSIDE6)
+        self.assertFalse(myokit.FORCE_PYSIDE2)
 
         with open(self._temp_dir.path('myokit.ini'), 'w') as f:
             f.write('[gui]\nbackend=pyqt5\n')
         self._config_module._load()
-        self.assertFalse(myokit.FORCE_PYSIDE)
-        self.assertFalse(myokit.FORCE_PYSIDE2)
-        self.assertFalse(myokit.FORCE_PYQT4)
+        self.assertFalse(myokit.FORCE_PYQT6)
         self.assertTrue(myokit.FORCE_PYQT5)
+        self.assertFalse(myokit.FORCE_PYSIDE6)
+        self.assertFalse(myokit.FORCE_PYSIDE2)
 
         with open(self._temp_dir.path('myokit.ini'), 'w') as f:
-            f.write('[gui]\nbackend=pyside\n')
+            f.write('[gui]\nbackend=pyside6\n')
         self._config_module._load()
-        self.assertTrue(myokit.FORCE_PYSIDE)
-        self.assertFalse(myokit.FORCE_PYSIDE2)
-        self.assertFalse(myokit.FORCE_PYQT4)
+        self.assertFalse(myokit.FORCE_PYQT6)
         self.assertFalse(myokit.FORCE_PYQT5)
+        self.assertTrue(myokit.FORCE_PYSIDE6)
+        self.assertFalse(myokit.FORCE_PYSIDE2)
 
         with open(self._temp_dir.path('myokit.ini'), 'w') as f:
             f.write('[gui]\nbackend=pyside2\n')
         self._config_module._load()
-        self.assertFalse(myokit.FORCE_PYSIDE)
-        self.assertTrue(myokit.FORCE_PYSIDE2)
-        self.assertFalse(myokit.FORCE_PYQT4)
+        self.assertFalse(myokit.FORCE_PYQT6)
         self.assertFalse(myokit.FORCE_PYQT5)
+        self.assertFalse(myokit.FORCE_PYSIDE6)
+        self.assertTrue(myokit.FORCE_PYSIDE2)
 
         # Empty has no effect
         with open(self._temp_dir.path('myokit.ini'), 'w') as f:
@@ -275,10 +242,10 @@ class TestConfig(unittest.TestCase):
         with WarningCollector() as c:
             self._config_module._load()
         self.assertEqual(c.text(), '')
-        self.assertFalse(myokit.FORCE_PYSIDE)
-        self.assertTrue(myokit.FORCE_PYSIDE2)
-        self.assertFalse(myokit.FORCE_PYQT4)
+        self.assertFalse(myokit.FORCE_PYQT6)
         self.assertFalse(myokit.FORCE_PYQT5)
+        self.assertFalse(myokit.FORCE_PYSIDE6)
+        self.assertTrue(myokit.FORCE_PYSIDE2)
 
         # Invalid raises warning
         with open(self._temp_dir.path('myokit.ini'), 'w') as f:

myokit/tests/test_datablock.py

@@ -5,11 +5,9 @@
 # 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 unittest
+
 import numpy as np
 
 import myokit
@@ -23,12 +21,6 @@ from myokit.tests import (
     WarningCollector,
 )
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
 
 class DataBlock1dTest(unittest.TestCase):
     """

myokit/tests/test_datalog.py

@@ -5,11 +5,9 @@
 # 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 unittest
+
 import numpy as np
 
 import myokit
@@ -23,21 +21,6 @@ from myokit.tests import (
     WarningCollector,
 )
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
-
-# Universal newline mode in Python 2 and 3
-def uopen(filename):
-    try:
-        return open(filename, 'r', newline=None)
-    except TypeError:
-        return open(filename, 'U')
-
-
 # Extra output
 debug = False
 
@@ -1395,12 +1378,12 @@ class DataLogTest(unittest.TestCase):
         with TemporaryDirectory() as td:
             fname = td.path('test.csv')
             d.save_csv(fname, order=['a.b', 'c.d', 'e.f'])
-            with uopen(fname) as f:
+            with open(fname, 'r', newline=None) as f:
                 header = f.readline()
             self.assertEqual(header, '"a.b","c.d","e.f"\n')
 
             d.save_csv(fname, order=['e.f', 'a.b', 'c.d'])
-            with uopen(fname) as f:
+            with open(fname, 'r', newline=None) as f:
                 header = f.readline()
             self.assertEqual(header, '"e.f","a.b","c.d"\n')
 
@@ -1422,7 +1405,7 @@ class DataLogTest(unittest.TestCase):
         with TemporaryDirectory() as td:
             fname = td.path('test.csv')
             d.save_csv(fname)
-            with uopen(fname) as f:
+            with open(fname, 'r', newline=None) as f:
                 order = [x[1:-1] for x in f.readline().strip().split(',')]
             self.assertEqual(len(order), 9)
             self.assertEqual(order[0], 'e.t')

myokit/tests/test_dependency_checking.py

@@ -6,9 +6,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 unittest
 
@@ -16,18 +13,6 @@ import myokit
 
 from myokit.tests import DIR_DATA
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
-# Strings in Python 2 and 3
-try:
-    basestring
-except NameError:   # pragma: no cover
-    basestring = str
-
 
 # Extra output
 debug = False
@@ -55,7 +40,7 @@ class DepTest(unittest.TestCase):
         """
         # If a string lhs is given, interpret it as a variable name and get
         # the lhs of its defining equation
-        if isinstance(key, basestring):
+        if isinstance(key, str):
             key = self.m.get(key)
             if isinstance(key, myokit.Variable):
                 key = key.lhs()
@@ -64,7 +49,7 @@ class DepTest(unittest.TestCase):
         # convert it to a Name. Ensure no duplicates are given.
         deps = list(set(deps))
         for k, dep in enumerate(deps):
-            if isinstance(dep, basestring):
+            if isinstance(dep, str):
                 deps[k] = self.n(dep)
 
         # Get dep map
@@ -449,7 +434,7 @@ class DeepDepTest(DepTest):
             return self.has_lhs(depmap, lhs, *deps)
 
         def nhas(lhs):
-            if isinstance(lhs, basestring):
+            if isinstance(lhs, str):
                 lhs = self.m.get(lhs).lhs()
             self.assertNotIn(lhs, depmap)
 
@@ -594,7 +579,7 @@ class DeepDepTest(DepTest):
             return self.has_lhs(depmap, lhs, *deps)
 
         def nhas(lhs):
-            if isinstance(lhs, basestring):
+            if isinstance(lhs, str):
                 lhs = self.m.get(lhs).lhs()
             self.assertNotIn(lhs, depmap)
 
@@ -1360,10 +1345,10 @@ class SolvableOrderTest(DepTest):
 
         def before(lhs1, *lhs2s):
             """ Asserts lhs1 comes before lhs2 in the current component """
-            if isinstance(lhs1, basestring):
+            if isinstance(lhs1, str):
                 lhs1 = self.m.get(self.ccomp + '.' + lhs1).lhs()
             for lhs2 in lhs2s:
-                if isinstance(lhs2, basestring):
+                if isinstance(lhs2, str):
                     lhs2 = self.m.get(self.ccomp + '.' + lhs2).lhs()
                 i1 = i2 = None
                 for i, eq in enumerate(self.order[self.ccomp]):
@@ -1508,14 +1493,14 @@ class SolvableOrderTest(DepTest):
 
         def before(lhs1, *lhs2s):
             """ Asserts lhs2 comes before lhs1 """
-            if isinstance(lhs1, basestring):
+            if isinstance(lhs1, str):
                 if lhs1.startswith('dot('):
                     lhs1 = myokit.Derivative(myokit.Name(
                         self.m.get(lhs1[4:-1])))
                 else:
                     lhs1 = myokit.Name(self.m.get(lhs1))
             for lhs2 in lhs2s:
-                if isinstance(lhs2, basestring):
+                if isinstance(lhs2, str):
                     if lhs2.startswith('dot('):
                         lhs2 = myokit.Derivative(myokit.Name(
                             self.m.get(lhs2[4:-1])))

myokit/tests/test_expressions.py

@@ -5,9 +5,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 pickle
 import unittest
 
@@ -15,12 +12,6 @@ import numpy as np
 
 import myokit
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
 
 # Unit --> See test_units.py
 # Quantity --> See test_units.py

myokit/tests/test_float.py

@@ -5,9 +5,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 unittest
 
@@ -91,8 +88,7 @@ class FloatTest(unittest.TestCase):
         # Test float to string conversion.
 
         # String should be passed through
-        # Note: convert to str() to test in python 2 and 3.
-        self.assertEqual(myokit.float.str(str('123')), '123')
+        self.assertEqual(myokit.float.str('123'), '123')
 
         # Simple numbers
         self.assertEqual(myokit.float.str(0), '0')

myokit/tests/test_formats.py

@@ -5,9 +5,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 unittest
 
 import myokit
@@ -15,12 +12,6 @@ import myokit.formats
 
 from myokit.tests import TemporaryDirectory
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
 
 class FormatsTest(unittest.TestCase):
     """

myokit/tests/test_formats_axon.py

@@ -5,11 +5,9 @@
 # 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 unittest
+
 import numpy as np
 
 import myokit
@@ -17,12 +15,6 @@ import myokit.formats.axon as axon
 
 from myokit.tests import TemporaryDirectory, DIR_FORMATS
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
 
 class AbfTest(unittest.TestCase):
     """

myokit/tests/test_formats_cellml.py

@@ -5,9 +5,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 re
 import unittest
@@ -23,18 +20,6 @@ from myokit.tests import TemporaryDirectory, DIR_FORMATS, WarningCollector
 # CellML dir
 DIR = os.path.join(DIR_FORMATS, 'cellml')
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
-# Strings in Python 2 and 3
-try:
-    basestring
-except NameError:   # pragma: no python 2 cover
-    basestring = str
-
 
 class CellMLExporterTest(unittest.TestCase):
     """

myokit/tests/test_formats_channelml.py

@@ -5,9 +5,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 unittest
 
@@ -20,18 +17,6 @@ from myokit.tests import DIR_FORMATS, WarningCollector
 # ChannelML dir
 DIR = os.path.join(DIR_FORMATS, 'channelml')
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:  # pragma: no python 3 cover
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
-# Strings in Python 2 and 3
-try:
-    basestring
-except NameError:   # pragma: no python 2 cover
-    basestring = str
-
 
 class ChannelMLTest(unittest.TestCase):
     """ Test ChannelML importing. """

myokit/tests/test_formats_easyml.py

@@ -5,9 +5,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 unittest
 
@@ -17,17 +14,6 @@ import myokit.formats.easyml
 
 from myokit.tests import TemporaryDirectory, WarningCollector, DIR_DATA
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:  # pragma: no python 3 cover
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
-# Strings in Python 2 and 3
-try:
-    basestring
-except NameError:   # pragma: no python 2 cover
-    basestring = str
 
 # Model that requires unit conversion
 units_model = """

myokit/tests/test_formats_exporters.py

@@ -5,9 +5,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 unittest
 
@@ -16,18 +13,6 @@ import myokit.formats
 
 from myokit.tests import TemporaryDirectory
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:  # pragma: no python 3 cover
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
-# Strings in Python 2 and 3
-try:
-    basestring
-except NameError:   # pragma: no python 2 cover
-    basestring = str
-
 
 class ExportTest(unittest.TestCase):
     """
@@ -38,7 +23,7 @@ class ExportTest(unittest.TestCase):
         """ Test a given exporter `e`. """
 
         # Test info method.
-        self.assertIsInstance(e.post_export_info(), basestring)
+        self.assertIsInstance(e.post_export_info(), str)
 
         # Load model, protocol
         m, p = model, protocol

myokit/tests/test_formats_expression_writers.py

@@ -5,9 +5,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 unittest
 
 import myokit
@@ -20,19 +17,6 @@ import myokit.formats.python
 import myokit.formats.stan
 
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:  # pragma: no python 3 cover
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
-# Strings in Python 2 and 3
-try:
-    basestring
-except NameError:   # pragma: no python 2 cover
-    basestring = str
-
-
 class ExpressionWriterTest(unittest.TestCase):
     """ Test shared expression writer functionality. """
 
@@ -45,7 +29,7 @@ class ExpressionWriterTest(unittest.TestCase):
 
         # Create one of each
         for e in es:
-            self.assertIsInstance(e, basestring)
+            self.assertIsInstance(e, str)
             e = myokit.formats.ewriter(e)
             self.assertTrue(isinstance(e, myokit.formats.ExpressionWriter))