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

myokit/tests/test_formats_html.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.formats.html

myokit/tests/test_formats_importers.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 as formats
 
 from myokit.tests import DIR_FORMATS
 
-# 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 ImporterTest(unittest.TestCase):
     """ Test shared importer functionality. """
@@ -37,7 +22,7 @@ class ImporterTest(unittest.TestCase):
         ims = myokit.formats.importers()
         self.assertTrue(len(ims) > 0)
         for i in ims:
-            self.assertIsInstance(i, basestring)
+            self.assertIsInstance(i, str)
             i = myokit.formats.importer(i)
             self.assertTrue(isinstance(i, myokit.formats.Importer))
 

myokit/tests/test_formats_mathml_content.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 re
 import unittest
 
@@ -16,12 +13,6 @@ import lxml.etree as etree
 import myokit
 import myokit.formats.mathml as mathml
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
 
 class ContentMathMLParserTest(unittest.TestCase):
     """ Tests content MathML parsing. """

myokit/tests/test_formats_mathml_presentation.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 re
 import unittest
 
 import myokit
 import myokit.formats.mathml as mathml
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
 
 class PresentationMathMLTest(unittest.TestCase):
     """

myokit/tests/test_formats_opencl.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,13 +12,6 @@ import myokit.formats
 import myokit.formats.opencl
 
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:  # pragma: no python 3 cover
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
-
 class OpenCLExpressionWriterTest(unittest.TestCase):
     """ Test the OpenCL ewriter class. """
 

myokit/tests/test_formats_sbml.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 @@ import myokit.formats.sbml
 # from shared import DIR_FORMATS, WarningCollector
 from myokit.tests import DIR_FORMATS, WarningCollector
 
-# 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 SBMLImporterTest(unittest.TestCase):
     """

myokit/tests/test_formats_sympy.py

@@ -5,20 +5,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 unittest
 
 import myokit
 import myokit.formats.sympy as mypy
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
 
 class SymPyReadWriteTest(unittest.TestCase):
     """

myokit/tests/test_formats_wcp.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.formats.wcp as wcp

myokit/tests/test_io.py

@@ -6,23 +6,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 unittest
+
 import numpy as np
 
 import myokit
 
 from myokit.tests import DIR_DATA, TemporaryDirectory
 
-# Strings in Python 2 and 3
-try:
-    basestring
-except NameError:
-    basestring = str
-
 
 class LoadSaveMmtTest(unittest.TestCase):
     """Tests load/save functions for mmt files."""
@@ -105,7 +97,7 @@ class LoadSaveMmtTest(unittest.TestCase):
         m, p, x = myokit.load(spath)
         self.assertIsNone(m)
         self.assertIsNone(p)
-        self.assertTrue(isinstance(x, basestring))
+        self.assertTrue(isinstance(x, str))
 
         self.assertRaises(
             myokit.SectionNotFoundError, myokit.load_model, ppath)
@@ -128,7 +120,7 @@ class LoadSaveMmtTest(unittest.TestCase):
         m, p, x = myokit.load('example')
         self.assertIsInstance(m, myokit.Model)
         self.assertIsInstance(p, myokit.Protocol)
-        self.assertTrue(isinstance(x, basestring))
+        self.assertTrue(isinstance(x, str))
 
         # Save all three and reload
         with TemporaryDirectory() as d:
@@ -318,10 +310,10 @@ class LoadSaveMmtTest(unittest.TestCase):
         ipath = os.path.join(DIR_DATA, 'lr-1991.mmt')
         # Test example loading
         x = myokit.load_script('example')
-        self.assertTrue(isinstance(x, basestring))
+        self.assertTrue(isinstance(x, str))
         # Test file loading
         x = myokit.load_script(ipath)
-        self.assertTrue(isinstance(x, basestring))
+        self.assertTrue(isinstance(x, str))
         with TemporaryDirectory() as d:
             opath = d.path('test.mmt')
             myokit.save_script(opath, x)
@@ -333,7 +325,7 @@ class LoadSaveMmtTest(unittest.TestCase):
             self.assertTrue('[[script]]' in text)
             # Test reloading
             xx = myokit.load_script(opath)
-            self.assertTrue(isinstance(xx, basestring))
+            self.assertTrue(isinstance(xx, str))
             self.assertEqual(x, xx)
 
 

myokit/tests/test_jacobian_calculator.py

@@ -5,23 +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 unittest
+
 import numpy as np
 
 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
-
 
 class JacobianCalculatorTest(unittest.TestCase):
     """

myokit/tests/test_jacobian_tracer.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
 
@@ -15,12 +12,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
-
 
 class JacobianTracerTest(unittest.TestCase):
     """

myokit/tests/test_lib_deps.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 random
 import unittest
 
 import myokit
 import myokit.lib.deps as deps
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
 
 class LibDepsTest(unittest.TestCase):
 

myokit/tests/test_lib_guess.py

@@ -5,20 +5,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 unittest
 
 import myokit
 import myokit.lib.guess as guess
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
 
 class LibGuessTest(unittest.TestCase):
     """

myokit/tests/test_lib_hh.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.lib.hh as hh
 
 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
-
 
 MODEL = """
 [[model]]

myokit/tests/test_lib_markov.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.lib.markov as markov
 
 from myokit.tests import DIR_DATA, WarningCollector
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
 
 class LinearModelTest(unittest.TestCase):
     """

myokit/tests/test_lib_multi.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
 
@@ -15,12 +12,6 @@ import myokit
 
 from myokit.tests import DIR_DATA, WarningCollector
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
 # Path to multi-model testing files
 DIR_MULTI = os.path.join(DIR_DATA, 'multi')
 

myokit/tests/test_lib_plots.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
 

myokit/tests/test_meta.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

myokit/tests/test_model.py

@@ -8,9 +8,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 re
 import unittest
@@ -20,13 +17,6 @@ import myokit
 from myokit.tests import TemporaryDirectory, WarningCollector
 
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
-
 class ModelTest(unittest.TestCase):
     """
     Tests parts of :class:`myokit.Model`.

myokit/tests/test_model_building.py

@@ -8,24 +8,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 myokit
 import unittest
 
-# Strings in Python 2 and 3
-try:
-    basestring
-except NameError:
-    basestring = str
-
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
 # Further model API tests are found in:
 #  - test_dependency_checking.py
 
@@ -300,10 +285,10 @@ class ModelBuildTest(unittest.TestCase):
 
         # Test dependency mapping
         def has(var, *dps):
-            lst = vrs[m.get(var).lhs() if isinstance(var, basestring) else var]
+            lst = vrs[m.get(var).lhs() if isinstance(var, str) else var]
             self.assertEqual(len(lst), len(dps))
             for d in dps:
-                d = m.get(d).lhs() if isinstance(d, basestring) else d
+                d = m.get(d).lhs() if isinstance(d, str) else d
                 self.assertIn(d, lst)
 
         vrs = m.map_shallow_dependencies(omit_states=False)

myokit/tests/test_opencl_info.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 unittest
 
 import myokit
 
 from myokit.tests import TemporaryDirectory, OpenCL_FOUND
 
-# Strings in Python2 and Python3
-try:
-    basestring
-except NameError:
-    basestring = str
-
 
 @unittest.skipIf(not OpenCL_FOUND, 'OpenCL not found on this system.')
 class OpenCLTest(unittest.TestCase):
@@ -35,12 +26,12 @@ class OpenCLTest(unittest.TestCase):
         # Tests the method to query the current device
         self.assertIsInstance(
             myokit.OpenCL.current_info(), myokit.OpenCLPlatformInfo)
-        self.assertIsInstance(myokit.OpenCL.current_info(True), basestring)
+        self.assertIsInstance(myokit.OpenCL.current_info(True), str)
 
     def test_info(self):
         # Tests the method to query the current device
         self.assertIsInstance(myokit.OpenCL.info(), myokit.OpenCLInfo)
-        self.assertIsInstance(myokit.OpenCL.info(True), basestring)
+        self.assertIsInstance(myokit.OpenCL.info(True), str)
 
     def test_load_save_selection(self):
         # Tests the load_selection method
@@ -83,9 +74,9 @@ class OpenCLTest(unittest.TestCase):
         item = info[0]
         self.assertEqual(len(item), 3)
         platform, device, specs = item
-        self.assertIsInstance(platform, basestring)
-        self.assertIsInstance(device, basestring)
-        self.assertIsInstance(specs, basestring)
+        self.assertIsInstance(platform, str)
+        self.assertIsInstance(device, str)
+        self.assertIsInstance(specs, str)
 
     def test_supported(self):
         # Tested as condition to get in, so must be true

myokit/tests/test_pacing_factory.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

myokit/tests/test_pacing_system_c.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 numpy as np
 
@@ -16,12 +13,6 @@ import myokit
 from myokit.tests.ansic_event_based_pacing import AnsicEventBasedPacing
 from myokit.tests.ansic_fixed_form_pacing import AnsicFixedFormPacing
 
-# Unit testing in Python 2 and 3
-try:
-    unittest.TestCase.assertRaisesRegex
-except AttributeError:
-    unittest.TestCase.assertRaisesRegex = unittest.TestCase.assertRaisesRegexp
-
 
 class EventBasedPacingAnsicTest(unittest.TestCase):
     """

myokit/tests/test_pacing_system_py.py

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

myokit/tests/test_parsing.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
 
@@ -17,18 +14,6 @@ import myokit.units
 
 from myokit.tests import DIR_DATA, TemporaryDirectory
 
-# 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 TokenizerTest(unittest.TestCase):
     """
@@ -908,29 +893,29 @@ class PhasedParseTest(unittest.TestCase):
             '[[script]]',
         )
         script = parse_script(code)
-        self.assertIsInstance(script, basestring)
+        self.assertIsInstance(script, str)
         script = parse_script(''.join(code))
-        self.assertIsInstance(script, basestring)
+        self.assertIsInstance(script, str)
 
         code = (
             '[[script]]\n',
         )
         script = parse_script(code)
-        self.assertIsInstance(script, basestring)
+        self.assertIsInstance(script, str)
 
         code = (
             '[[script]]\n',
             'print("hi")',
         )
         script = parse_script(code)
-        self.assertIsInstance(script, basestring)
+        self.assertIsInstance(script, str)
 
         code = (
             '[[script]]\n',
             'print("hi")\n',
         )
         script = parse_script(code)
-        self.assertIsInstance(script, basestring)
+        self.assertIsInstance(script, str)
 
         # Not a script
         code = (

myokit/tests/test_progress_reporters.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 re
 import time