Remove polyfill for assertRaisesRegex function in unittest module (#123)

addisonElliott · web-flow · commit 1026694b5c65 · 2022-08-27T13:29:48.000-05:00
No longer needed since Python 2 support has been dropped
diff --git a/nrrd/tests/test_formatting.py b/nrrd/tests/test_formatting.py
@@ -1,7 +1,8 @@
+import unittest
+
 import numpy as np
 
 import nrrd
-from nrrd.tests.util import *
 
 
 class TestFieldFormatting(unittest.TestCase):
diff --git a/nrrd/tests/test_parsing.py b/nrrd/tests/test_parsing.py
@@ -1,7 +1,8 @@
+import unittest
+
 import numpy as np
 
 import nrrd
-from nrrd.tests.util import *
 
 
 class TestFieldParsing(unittest.TestCase):
diff --git a/nrrd/tests/test_reading.py b/nrrd/tests/test_reading.py
@@ -1,3 +1,5 @@
+import unittest
+
 import numpy as np
 
 import nrrd
diff --git a/nrrd/tests/test_writing.py b/nrrd/tests/test_writing.py
@@ -1,5 +1,6 @@
 import io
 import tempfile
+import unittest
 
 import numpy as np
 
diff --git a/nrrd/tests/util.py b/nrrd/tests/util.py
@@ -1,5 +1,4 @@
 import os
-import unittest
 import warnings
 
 # Enable all warnings
@@ -22,8 +21,3 @@
 ASCII_1D_NRRD_FILE_PATH = os.path.join(DATA_DIR_PATH, 'test1d_ascii.nrrd')
 ASCII_2D_NRRD_FILE_PATH = os.path.join(DATA_DIR_PATH, 'test2d_ascii.nrrd')
 ASCII_1D_CUSTOM_FIELDS_FILE_PATH = os.path.join(DATA_DIR_PATH, 'test_customFields.nrrd')
-
-# Fix issue with assertRaisesRegex only available in Python 3 while
-# assertRaisesRegexp is available in Python 2 (and deprecated in Python 3)
-if not hasattr(unittest.TestCase, 'assertRaisesRegex'):
-    unittest.TestCase.assertRaisesRegex = getattr(unittest.TestCase, 'assertRaisesRegexp')
