summaryrefslogtreecommitdiff
path: root/numpy
diff options
context:
space:
mode:
Diffstat (limited to 'numpy')
-rw-r--r--numpy/core/tests/test_multiarray.py6
-rw-r--r--numpy/core/tests/test_numeric.py8
-rw-r--r--numpy/core/tests/test_regression.py2
-rw-r--r--numpy/core/tests/test_scalarmath.py2
-rw-r--r--numpy/f2py/tests/test_array_from_pyobj.py4
-rw-r--r--numpy/f2py/tests/test_callback.py2
-rw-r--r--numpy/lib/tests/test_twodim_base.py6
-rw-r--r--numpy/lib/tests/test_type_check.py2
-rw-r--r--numpy/linalg/tests/test_build.py2
-rw-r--r--numpy/linalg/tests/test_linalg.py6
10 files changed, 20 insertions, 20 deletions
diff --git a/numpy/core/tests/test_multiarray.py b/numpy/core/tests/test_multiarray.py
index feacffdd6..fc51f8cb3 100644
--- a/numpy/core/tests/test_multiarray.py
+++ b/numpy/core/tests/test_multiarray.py
@@ -1020,7 +1020,7 @@ class TestClip(TestCase):
assert np.all(x <= 4)
-class TestPutmask:
+class TestPutmask(object):
def tst_basic(self,x,T,mask,val):
np.putmask(x,mask,val)
assert np.all(x[mask] == T(val))
@@ -1066,7 +1066,7 @@ class TestPutmask:
pass
-class TestTake:
+class TestTake(object):
def tst_basic(self,x):
ind = range(x.shape[0])
assert_array_equal(x.take(ind, axis=0), x)
@@ -1330,7 +1330,7 @@ class TestIO(object):
in_foreign_locale(self.test_tofile_format)()
-class TestFromBuffer:
+class TestFromBuffer(object):
def tst_basic(self,buffer,expected,kwargs):
assert_array_equal(np.frombuffer(buffer,**kwargs),expected)
diff --git a/numpy/core/tests/test_numeric.py b/numpy/core/tests/test_numeric.py
index f46871373..348a7dd70 100644
--- a/numpy/core/tests/test_numeric.py
+++ b/numpy/core/tests/test_numeric.py
@@ -9,7 +9,7 @@ from numpy.testing.utils import WarningManager
from numpy.core.multiarray import dot as dot_
import warnings
-class Vec:
+class Vec(object):
def __init__(self,sequence=None):
if sequence is None:
sequence=[]
@@ -1039,7 +1039,7 @@ class TestClip(TestCase):
self.assertTrue(a2 is a)
-class TestAllclose:
+class TestAllclose(object):
rtol = 1e-5
atol = 1e-8
@@ -1283,7 +1283,7 @@ class TestCorrelateNew(_TestCorrelate):
z = np.correlate(y, x, 'full', old_behavior=self.old_behavior)
assert_array_almost_equal(z, r_z)
-class TestArgwhere:
+class TestArgwhere(object):
def test_2D(self):
x = np.arange(6).reshape((2, 3))
assert_array_equal(np.argwhere(x > 1),
@@ -1295,7 +1295,7 @@ class TestArgwhere:
def test_list(self):
assert_equal(np.argwhere([4, 0, 2, 1, 3]), [[0], [2], [3], [4]])
-class TestStringFunction:
+class TestStringFunction(object):
def test_set_string_function(self):
a = np.array([1])
np.set_string_function(lambda x: "FOO", repr=True)
diff --git a/numpy/core/tests/test_regression.py b/numpy/core/tests/test_regression.py
index 8ec22b8a2..8014628a0 100644
--- a/numpy/core/tests/test_regression.py
+++ b/numpy/core/tests/test_regression.py
@@ -804,7 +804,7 @@ class TestRegression(TestCase):
def test_mem_custom_float_to_array(self, level=rlevel):
"""Ticket 702"""
- class MyFloat:
+ class MyFloat(object):
def __float__(self):
return 1.0
diff --git a/numpy/core/tests/test_scalarmath.py b/numpy/core/tests/test_scalarmath.py
index 9061e61fc..b00164525 100644
--- a/numpy/core/tests/test_scalarmath.py
+++ b/numpy/core/tests/test_scalarmath.py
@@ -103,7 +103,7 @@ class TestConversion(TestCase):
# assert_equal( val, val2 )
-class TestRepr:
+class TestRepr(object):
def _test_type_repr(self, t):
finfo=np.finfo(t)
last_fraction_bit_idx = finfo.nexp + finfo.nmant
diff --git a/numpy/f2py/tests/test_array_from_pyobj.py b/numpy/f2py/tests/test_array_from_pyobj.py
index 488fd4db5..ccf237ee1 100644
--- a/numpy/f2py/tests/test_array_from_pyobj.py
+++ b/numpy/f2py/tests/test_array_from_pyobj.py
@@ -51,7 +51,7 @@ def flags2names(flags):
info.append(flagname)
return info
-class Intent:
+class Intent(object):
def __init__(self,intent_list=[]):
self.intent_list = intent_list[:]
flags = 0
@@ -166,7 +166,7 @@ class Type(object):
types.append(Type(name))
return types
-class Array:
+class Array(object):
def __init__(self,typ,dims,intent,obj):
self.type = typ
self.dims = dims
diff --git a/numpy/f2py/tests/test_callback.py b/numpy/f2py/tests/test_callback.py
index 7f0107fd5..6a201a951 100644
--- a/numpy/f2py/tests/test_callback.py
+++ b/numpy/f2py/tests/test_callback.py
@@ -59,7 +59,7 @@ cf2py intent(out) a
assert_( r==11,`r`)
r = t(self.module.func0._cpointer)
assert_( r==11,`r`)
- class A:
+ class A(object):
def __call__(self):
return 7
def mth(self):
diff --git a/numpy/lib/tests/test_twodim_base.py b/numpy/lib/tests/test_twodim_base.py
index 85e76a384..a7c0e85c8 100644
--- a/numpy/lib/tests/test_twodim_base.py
+++ b/numpy/lib/tests/test_twodim_base.py
@@ -277,7 +277,7 @@ def test_tril_indices():
[-10, -10, -10, -10]]) )
-class TestTriuIndices:
+class TestTriuIndices(object):
def test_triu_indices(self):
iu1 = triu_indices(4)
iu2 = triu_indices(4, 2)
@@ -308,14 +308,14 @@ class TestTriuIndices:
[ 13, 14, 15, -1]]) )
-class TestTrilIndicesFrom:
+class TestTrilIndicesFrom(object):
def test_exceptions(self):
assert_raises(ValueError, tril_indices_from, np.ones((2,)))
assert_raises(ValueError, tril_indices_from, np.ones((2,2,2)))
assert_raises(ValueError, tril_indices_from, np.ones((2,3)))
-class TestTriuIndicesFrom:
+class TestTriuIndicesFrom(object):
def test_exceptions(self):
assert_raises(ValueError, triu_indices_from, np.ones((2,)))
assert_raises(ValueError, triu_indices_from, np.ones((2,2,2)))
diff --git a/numpy/lib/tests/test_type_check.py b/numpy/lib/tests/test_type_check.py
index 941768aa5..30b25c42f 100644
--- a/numpy/lib/tests/test_type_check.py
+++ b/numpy/lib/tests/test_type_check.py
@@ -382,7 +382,7 @@ class TestArrayConversion(TestCase):
assert_equal(a.__class__,ndarray)
assert issubdtype(a.dtype,float)
-class TestDateTimeData:
+class TestDateTimeData(object):
@dec.skipif(not _HAS_CTYPE, "ctypes not available on this python installation")
def test_basic(self):
diff --git a/numpy/linalg/tests/test_build.py b/numpy/linalg/tests/test_build.py
index 6b6c24d61..e9d52c876 100644
--- a/numpy/linalg/tests/test_build.py
+++ b/numpy/linalg/tests/test_build.py
@@ -8,7 +8,7 @@ from numpy.testing import TestCase, dec
from numpy.compat import asbytes_nested
-class FindDependenciesLdd:
+class FindDependenciesLdd(object):
def __init__(self):
self.cmd = ['ldd']
diff --git a/numpy/linalg/tests/test_linalg.py b/numpy/linalg/tests/test_linalg.py
index cccd51d1f..e1aa4afb8 100644
--- a/numpy/linalg/tests/test_linalg.py
+++ b/numpy/linalg/tests/test_linalg.py
@@ -22,7 +22,7 @@ def assert_almost_equal(a, b, **kw):
decimal = 12
old_assert_almost_equal(a, b, decimal=decimal, **kw)
-class LinalgTestCase:
+class LinalgTestCase(object):
def test_single(self):
a = array([[1.,2.], [3.,4.]], dtype=single)
b = array([2., 1.], dtype=single)
@@ -80,7 +80,7 @@ class LinalgTestCase:
self.do(a, b)
-class LinalgNonsquareTestCase:
+class LinalgNonsquareTestCase(object):
def test_single_nsq_1(self):
a = array([[1.,2.,3.], [3.,4.,6.]], dtype=single)
b = array([2., 1.], dtype=single)
@@ -240,7 +240,7 @@ class TestLstsq(LinalgTestCase, LinalgNonsquareTestCase, TestCase):
assert imply(isinstance(b, matrix), isinstance(x, matrix))
assert imply(isinstance(b, matrix), isinstance(residuals, matrix))
-class TestMatrixPower:
+class TestMatrixPower(object):
R90 = array([[0,1],[-1,0]])
Arb22 = array([[4,-7],[-2,10]])
noninv = array([[1,0],[0,0]])
View Lorry Controller Status