Use new-style classes with multiple-inheritance to address bug in IronPython.

4 files changed, 9 insertions, 9 deletions

diff --git a/numpy/core/tests/test_numerictypes.py b/numpy/core/tests/test_numerictypes.py
index 745f48737..7f857065c 100644
--- a/numpy/core/tests/test_numerictypes.py
+++ b/numpy/core/tests/test_numerictypes.py
@@ -97,7 +97,7 @@ def normalize_descr(descr):
 #    Creation tests
 ############################################################
 
-class create_zeros:
+class create_zeros(object):
     """Check the creation of heterogeneous arrays zero-valued"""
 
     def test_zeros0D(self):
@@ -140,7 +140,7 @@ class test_create_zeros_nested(create_zeros, TestCase):
     _descr = Ndescr
 
 
-class create_values:
+class create_values(object):
     """Check the creation of heterogeneous arrays with values"""
 
     def test_tuple(self):
@@ -200,7 +200,7 @@ class test_create_values_nested_multiple(create_values, TestCase):
 #    Reading tests
 ############################################################
 
-class read_values_plain:
+class read_values_plain(object):
     """Check the reading of values in heterogeneous arrays (plain)"""
 
     def test_access_fields(self):
@@ -232,7 +232,7 @@ class test_read_values_plain_multiple(read_values_plain, TestCase):
     multiple_rows = 1
     _buffer = PbufferT
 
-class read_values_nested:
+class read_values_nested(object):
     """Check the reading of values in heterogeneous arrays (nested)"""
 
 
diff --git a/numpy/core/tests/test_unicode.py b/numpy/core/tests/test_unicode.py
index 4968b28ac..3588e3d35 100644
--- a/numpy/core/tests/test_unicode.py
+++ b/numpy/core/tests/test_unicode.py
@@ -17,7 +17,7 @@ ucs4_value = u'\U0010FFFF'
 #    Creation tests
 ############################################################
 
-class create_zeros:
+class create_zeros(object):
     """Check the creation of zero-valued arrays"""
 
     def content_check(self, ua, ua_scalar, nbytes):
@@ -69,7 +69,7 @@ class test_create_zeros_1009(create_zeros, TestCase):
     ulen = 1009
 
 
-class create_values:
+class create_values(object):
     """Check the creation of unicode arrays with values"""
 
     def content_check(self, ua, ua_scalar, nbytes):
@@ -154,7 +154,7 @@ class test_create_values_1009_ucs4(create_values, TestCase):
 #    Assignment tests
 ############################################################
 
-class assign_values:
+class assign_values(object):
     """Check the assignment of unicode arrays with values"""
 
     def content_check(self, ua, ua_scalar, nbytes):
diff --git a/numpy/lib/tests/test_io.py b/numpy/lib/tests/test_io.py
index aee727efa..6ccfa818c 100644
--- a/numpy/lib/tests/test_io.py
+++ b/numpy/lib/tests/test_io.py
@@ -8,7 +8,7 @@ import sys
 
 MAJVER, MINVER = sys.version_info[:2]
 
-class RoundtripTest:
+class RoundtripTest(object):
     def roundtrip(self, save_func, *args, **kwargs):
         """
         save_func : callable
diff --git a/numpy/linalg/tests/test_linalg.py b/numpy/linalg/tests/test_linalg.py
index 8fd8b72ed..e8e5a8abd 100644
--- a/numpy/linalg/tests/test_linalg.py
+++ b/numpy/linalg/tests/test_linalg.py
@@ -202,7 +202,7 @@ class TestBoolPower(TestCase):
         assert_equal(matrix_power(A,2),A)
 
 
-class HermitianTestCase:
+class HermitianTestCase(object):
     def test_single(self):
         a = array([[1.,2.], [2.,1.]], dtype=single)
         self.do(a)