summaryrefslogtreecommitdiff
path: root/numpy/f2py/tests
diff options
context:
space:
mode:
Diffstat (limited to 'numpy/f2py/tests')
-rw-r--r--numpy/f2py/tests/test_array_from_pyobj.py54
-rw-r--r--numpy/f2py/tests/test_assumed_shape.py10
-rw-r--r--numpy/f2py/tests/test_callback.py22
-rw-r--r--numpy/f2py/tests/test_return_character.py12
-rw-r--r--numpy/f2py/tests/test_return_complex.py2
-rw-r--r--numpy/f2py/tests/test_return_integer.py2
-rw-r--r--numpy/f2py/tests/test_return_logical.py4
-rw-r--r--numpy/f2py/tests/test_return_real.py2
-rw-r--r--numpy/f2py/tests/test_size.py14
9 files changed, 61 insertions, 61 deletions
diff --git a/numpy/f2py/tests/test_array_from_pyobj.py b/numpy/f2py/tests/test_array_from_pyobj.py
index 773dd75a1..0621855f3 100644
--- a/numpy/f2py/tests/test_array_from_pyobj.py
+++ b/numpy/f2py/tests/test_array_from_pyobj.py
@@ -179,14 +179,14 @@ class Array(object):
# arr.dtypechar may be different from typ.dtypechar
self.arr = wrap.call(typ.type_num,dims,intent.flags,obj)
- assert_(isinstance(self.arr, ndarray),`type(self.arr)`)
+ assert_(isinstance(self.arr, ndarray),repr(type(self.arr)))
self.arr_attr = wrap.array_attrs(self.arr)
if len(dims)>1:
if self.intent.is_intent('c'):
assert_(intent.flags & wrap.F2PY_INTENT_C)
- assert_(not self.arr.flags['FORTRAN'],`self.arr.flags,getattr(obj,'flags',None)`)
+ assert_(not self.arr.flags['FORTRAN'],repr((self.arr.flags,getattr(obj,'flags',None))))
assert_(self.arr.flags['CONTIGUOUS'])
assert_(not self.arr_attr[6] & wrap.FORTRAN)
else:
@@ -201,14 +201,14 @@ class Array(object):
return
if intent.is_intent('cache'):
- assert_(isinstance(obj,ndarray),`type(obj)`)
+ assert_(isinstance(obj,ndarray),repr(type(obj)))
self.pyarr = array(obj).reshape(*dims).copy()
else:
self.pyarr = array(array(obj,
dtype = typ.dtypechar).reshape(*dims),
order=self.intent.is_intent('c') and 'C' or 'F')
assert_(self.pyarr.dtype == typ, \
- `self.pyarr.dtype,typ`)
+ repr((self.pyarr.dtype,typ)))
assert_(self.pyarr.flags['OWNDATA'], (obj, intent))
self.pyarr_attr = wrap.array_attrs(self.pyarr)
@@ -227,18 +227,18 @@ class Array(object):
assert_(self.arr_attr[2]==self.pyarr_attr[2]) # dimensions
if self.arr_attr[1]<=1:
assert_(self.arr_attr[3]==self.pyarr_attr[3],\
- `self.arr_attr[3],self.pyarr_attr[3],self.arr.tostring(),self.pyarr.tostring()`) # strides
+ repr((self.arr_attr[3],self.pyarr_attr[3],self.arr.tostring(),self.pyarr.tostring()))) # strides
assert_(self.arr_attr[5][-2:]==self.pyarr_attr[5][-2:],\
- `self.arr_attr[5],self.pyarr_attr[5]`) # descr
+ repr((self.arr_attr[5],self.pyarr_attr[5]))) # descr
assert_(self.arr_attr[6]==self.pyarr_attr[6],\
- `self.arr_attr[6],self.pyarr_attr[6],flags2names(0*self.arr_attr[6]-self.pyarr_attr[6]),flags2names(self.arr_attr[6]),intent`) # flags
+ repr((self.arr_attr[6],self.pyarr_attr[6],flags2names(0*self.arr_attr[6]-self.pyarr_attr[6]),flags2names(self.arr_attr[6]),intent))) # flags
if intent.is_intent('cache'):
assert_(self.arr_attr[5][3]>=self.type.elsize,\
- `self.arr_attr[5][3],self.type.elsize`)
+ repr((self.arr_attr[5][3],self.type.elsize)))
else:
assert_(self.arr_attr[5][3]==self.type.elsize,\
- `self.arr_attr[5][3],self.type.elsize`)
+ repr((self.arr_attr[5][3],self.type.elsize)))
assert_(self.arr_equal(self.pyarr,self.arr))
if isinstance(self.obj,ndarray):
@@ -288,9 +288,9 @@ class _test_shared_memory:
obj = array(self.num2seq,dtype=t.dtype)
a = self.array([len(self.num2seq)],intent.in_,obj)
if t.elsize==self.type.elsize:
- assert_(a.has_shared_memory(),`self.type.dtype,t.dtype`)
+ assert_(a.has_shared_memory(),repr((self.type.dtype,t.dtype)))
else:
- assert_(not a.has_shared_memory(),`t.dtype`)
+ assert_(not a.has_shared_memory(),repr(t.dtype))
def test_inout_2seq(self):
obj = array(self.num2seq,dtype=self.type.dtype)
@@ -331,7 +331,7 @@ class _test_shared_memory:
for t in self.type.cast_types():
obj = array(self.num2seq,dtype=t.dtype)
a = self.array([len(self.num2seq)],intent.in_.copy,obj)
- assert_(not a.has_shared_memory(),`t.dtype`)
+ assert_(not a.has_shared_memory(),repr(t.dtype))
def test_c_in_from_23seq(self):
a = self.array([len(self.num23seq),len(self.num23seq[0])],
@@ -343,7 +343,7 @@ class _test_shared_memory:
obj = array(self.num23seq,dtype=t.dtype)
a = self.array([len(self.num23seq),len(self.num23seq[0])],
intent.in_,obj)
- assert_(not a.has_shared_memory(),`t.dtype`)
+ assert_(not a.has_shared_memory(),repr(t.dtype))
def test_f_in_from_23casttype(self):
for t in self.type.cast_types():
@@ -351,9 +351,9 @@ class _test_shared_memory:
a = self.array([len(self.num23seq),len(self.num23seq[0])],
intent.in_,obj)
if t.elsize==self.type.elsize:
- assert_(a.has_shared_memory(),`t.dtype`)
+ assert_(a.has_shared_memory(),repr(t.dtype))
else:
- assert_(not a.has_shared_memory(),`t.dtype`)
+ assert_(not a.has_shared_memory(),repr(t.dtype))
def test_c_in_from_23casttype(self):
for t in self.type.cast_types():
@@ -361,23 +361,23 @@ class _test_shared_memory:
a = self.array([len(self.num23seq),len(self.num23seq[0])],
intent.in_.c,obj)
if t.elsize==self.type.elsize:
- assert_(a.has_shared_memory(),`t.dtype`)
+ assert_(a.has_shared_memory(),repr(t.dtype))
else:
- assert_(not a.has_shared_memory(),`t.dtype`)
+ assert_(not a.has_shared_memory(),repr(t.dtype))
def test_f_copy_in_from_23casttype(self):
for t in self.type.cast_types():
obj = array(self.num23seq,dtype=t.dtype,order='F')
a = self.array([len(self.num23seq),len(self.num23seq[0])],
intent.in_.copy,obj)
- assert_(not a.has_shared_memory(),`t.dtype`)
+ assert_(not a.has_shared_memory(),repr(t.dtype))
def test_c_copy_in_from_23casttype(self):
for t in self.type.cast_types():
obj = array(self.num23seq,dtype=t.dtype)
a = self.array([len(self.num23seq),len(self.num23seq[0])],
intent.in_.c.copy,obj)
- assert_(not a.has_shared_memory(),`t.dtype`)
+ assert_(not a.has_shared_memory(),repr(t.dtype))
def test_in_cache_from_2casttype(self):
for t in self.type.all_types():
@@ -386,17 +386,17 @@ class _test_shared_memory:
obj = array(self.num2seq,dtype=t.dtype)
shape = (len(self.num2seq),)
a = self.array(shape,intent.in_.c.cache,obj)
- assert_(a.has_shared_memory(),`t.dtype`)
+ assert_(a.has_shared_memory(),repr(t.dtype))
a = self.array(shape,intent.in_.cache,obj)
- assert_(a.has_shared_memory(),`t.dtype`)
+ assert_(a.has_shared_memory(),repr(t.dtype))
obj = array(self.num2seq,dtype=t.dtype,order='F')
a = self.array(shape,intent.in_.c.cache,obj)
- assert_(a.has_shared_memory(),`t.dtype`)
+ assert_(a.has_shared_memory(),repr(t.dtype))
a = self.array(shape,intent.in_.cache,obj)
- assert_(a.has_shared_memory(),`t.dtype`)
+ assert_(a.has_shared_memory(),repr(t.dtype))
try:
a = self.array(shape,intent.in_.cache,obj[::-1])
@@ -505,9 +505,9 @@ class _test_shared_memory:
assert_(not obj.flags['FORTRAN'] and obj.flags['CONTIGUOUS'])
shape = obj.shape
a = self.array(shape,intent.inplace,obj)
- assert_(obj[1][2]==a.arr[1][2],`obj,a.arr`)
+ assert_(obj[1][2]==a.arr[1][2],repr((obj,a.arr)))
a.arr[1][2]=54
- assert_(obj[1][2]==a.arr[1][2]==array(54,dtype=self.type.dtype),`obj,a.arr`)
+ assert_(obj[1][2]==a.arr[1][2]==array(54,dtype=self.type.dtype),repr((obj,a.arr)))
assert_(a.arr is obj)
assert_(obj.flags['FORTRAN']) # obj attributes are changed inplace!
assert_(not obj.flags['CONTIGUOUS'])
@@ -522,9 +522,9 @@ class _test_shared_memory:
assert_(not obj.flags['FORTRAN'] and obj.flags['CONTIGUOUS'])
shape = obj.shape
a = self.array(shape,intent.inplace,obj)
- assert_(obj[1][2]==a.arr[1][2],`obj,a.arr`)
+ assert_(obj[1][2]==a.arr[1][2],repr((obj,a.arr)))
a.arr[1][2]=54
- assert_(obj[1][2]==a.arr[1][2]==array(54,dtype=self.type.dtype),`obj,a.arr`)
+ assert_(obj[1][2]==a.arr[1][2]==array(54,dtype=self.type.dtype),repr((obj,a.arr)))
assert_(a.arr is obj)
assert_(obj.flags['FORTRAN']) # obj attributes are changed inplace!
assert_(not obj.flags['CONTIGUOUS'])
diff --git a/numpy/f2py/tests/test_assumed_shape.py b/numpy/f2py/tests/test_assumed_shape.py
index f3a840272..6c0ea9ebd 100644
--- a/numpy/f2py/tests/test_assumed_shape.py
+++ b/numpy/f2py/tests/test_assumed_shape.py
@@ -21,16 +21,16 @@ class TestAssumedShapeSumExample(util.F2PyTest):
@dec.slow
def test_all(self):
r = self.module.fsum([1,2])
- assert_(r==3,`r`)
+ assert_(r==3,repr(r))
r = self.module.sum([1,2])
- assert_(r==3,`r`)
+ assert_(r==3,repr(r))
r = self.module.sum_with_use([1,2])
- assert_(r==3,`r`)
+ assert_(r==3,repr(r))
r = self.module.mod.sum([1,2])
- assert_(r==3,`r`)
+ assert_(r==3,repr(r))
r = self.module.mod.fsum([1,2])
- assert_(r==3,`r`)
+ assert_(r==3,repr(r))
if __name__ == "__main__":
import nose
diff --git a/numpy/f2py/tests/test_callback.py b/numpy/f2py/tests/test_callback.py
index 6ae473ac7..7a7e8bc11 100644
--- a/numpy/f2py/tests/test_callback.py
+++ b/numpy/f2py/tests/test_callback.py
@@ -74,24 +74,24 @@ cf2py intent(out) a
def check_function(self, name):
t = getattr(self.module, name)
r = t(lambda : 4)
- assert_( r==4,`r`)
+ assert_( r==4,repr(r))
r = t(lambda a:5,fun_extra_args=(6,))
- assert_( r==5,`r`)
+ assert_( r==5,repr(r))
r = t(lambda a:a,fun_extra_args=(6,))
- assert_( r==6,`r`)
+ assert_( r==6,repr(r))
r = t(lambda a:5+a,fun_extra_args=(7,))
- assert_( r==12,`r`)
+ assert_( r==12,repr(r))
r = t(lambda a:math.degrees(a),fun_extra_args=(math.pi,))
- assert_( r==180,`r`)
+ assert_( r==180,repr(r))
r = t(math.degrees,fun_extra_args=(math.pi,))
- assert_( r==180,`r`)
+ assert_( r==180,repr(r))
r = t(self.module.func, fun_extra_args=(6,))
- assert_( r==17,`r`)
+ assert_( r==17,repr(r))
r = t(self.module.func0)
- assert_( r==11,`r`)
+ assert_( r==11,repr(r))
r = t(self.module.func0._cpointer)
- assert_( r==11,`r`)
+ assert_( r==11,repr(r))
class A(object):
def __call__(self):
return 7
@@ -99,9 +99,9 @@ cf2py intent(out) a
return 9
a = A()
r = t(a)
- assert_( r==7,`r`)
+ assert_( r==7,repr(r))
r = t(a.mth)
- assert_( r==9,`r`)
+ assert_( r==9,repr(r))
if __name__ == "__main__":
import nose
diff --git a/numpy/f2py/tests/test_return_character.py b/numpy/f2py/tests/test_return_character.py
index 97378959f..213730008 100644
--- a/numpy/f2py/tests/test_return_character.py
+++ b/numpy/f2py/tests/test_return_character.py
@@ -10,17 +10,17 @@ class TestReturnCharacter(util.F2PyTest):
tname = t.__doc__.split()[0]
if tname in ['t0','t1','s0','s1']:
assert_( t(23)==asbytes('2'))
- r = t('ab');assert_( r==asbytes('a'),`r`)
- r = t(array('ab'));assert_( r==asbytes('a'),`r`)
- r = t(array(77,'u1'));assert_( r==asbytes('M'),`r`)
+ r = t('ab');assert_( r==asbytes('a'),repr(r))
+ r = t(array('ab'));assert_( r==asbytes('a'),repr(r))
+ r = t(array(77,'u1'));assert_( r==asbytes('M'),repr(r))
#assert_(_raises(ValueError, t, array([77,87])))
#assert_(_raises(ValueError, t, array(77)))
elif tname in ['ts','ss']:
- assert_( t(23)==asbytes('23 '),`t(23)`)
+ assert_( t(23)==asbytes('23 '),repr(t(23)))
assert_( t('123456789abcdef')==asbytes('123456789a'))
elif tname in ['t5','s5']:
- assert_( t(23)==asbytes('23 '),`t(23)`)
- assert_( t('ab')==asbytes('ab '),`t('ab')`)
+ assert_( t(23)==asbytes('23 '),repr(t(23)))
+ assert_( t('ab')==asbytes('ab '),repr(t('ab')))
assert_( t('123456789abcdef')==asbytes('12345'))
else:
raise NotImplementedError
diff --git a/numpy/f2py/tests/test_return_complex.py b/numpy/f2py/tests/test_return_complex.py
index 14bf8f6ad..afbe2a4f2 100644
--- a/numpy/f2py/tests/test_return_complex.py
+++ b/numpy/f2py/tests/test_return_complex.py
@@ -45,7 +45,7 @@ class TestReturnComplex(util.F2PyTest):
try:
r = t(10l**400)
- assert_( `r` in ['(inf+0j)','(Infinity+0j)'],`r`)
+ assert_( repr(r) in ['(inf+0j)','(Infinity+0j)'],repr(r))
except OverflowError:
pass
diff --git a/numpy/f2py/tests/test_return_integer.py b/numpy/f2py/tests/test_return_integer.py
index 77d26dcc7..81ad4960b 100644
--- a/numpy/f2py/tests/test_return_integer.py
+++ b/numpy/f2py/tests/test_return_integer.py
@@ -6,7 +6,7 @@ import util
class TestReturnInteger(util.F2PyTest):
def check_function(self, t):
- assert_( t(123)==123,`t(123)`)
+ assert_( t(123)==123,repr(t(123)))
assert_( t(123.6)==123)
assert_( t(123l)==123)
assert_( t('123')==123)
diff --git a/numpy/f2py/tests/test_return_logical.py b/numpy/f2py/tests/test_return_logical.py
index 42a502806..43764a558 100644
--- a/numpy/f2py/tests/test_return_logical.py
+++ b/numpy/f2py/tests/test_return_logical.py
@@ -6,8 +6,8 @@ import util
class TestReturnLogical(util.F2PyTest):
def check_function(self, t):
- assert_( t(True)==1,`t(True)`)
- assert_( t(False)==0,`t(False)`)
+ assert_( t(True)==1,repr(t(True)))
+ assert_( t(False)==0,repr(t(False)))
assert_( t(0)==0)
assert_( t(None)==0)
assert_( t(0.0)==0)
diff --git a/numpy/f2py/tests/test_return_real.py b/numpy/f2py/tests/test_return_real.py
index dfa4d68c9..e741e9581 100644
--- a/numpy/f2py/tests/test_return_real.py
+++ b/numpy/f2py/tests/test_return_real.py
@@ -43,7 +43,7 @@ class TestReturnReal(util.F2PyTest):
try:
r = t(10l**400)
- assert_( `r` in ['inf','Infinity'],`r`)
+ assert_( repr(r) in ['inf','Infinity'],repr(r))
except OverflowError:
pass
diff --git a/numpy/f2py/tests/test_size.py b/numpy/f2py/tests/test_size.py
index 75398060b..6cc508a19 100644
--- a/numpy/f2py/tests/test_size.py
+++ b/numpy/f2py/tests/test_size.py
@@ -18,29 +18,29 @@ class TestSizeSumExample(util.F2PyTest):
@dec.slow
def test_all(self):
r = self.module.foo([[1,2]])
- assert_equal(r, [3],`r`)
+ assert_equal(r, [3],repr(r))
r = self.module.foo([[1,2],[3,4]])
- assert_equal(r, [3,7],`r`)
+ assert_equal(r, [3,7],repr(r))
r = self.module.foo([[1,2],[3,4],[5,6]])
- assert_equal(r, [3,7,11],`r`)
+ assert_equal(r, [3,7,11],repr(r))
@dec.slow
def test_transpose(self):
r = self.module.trans([[1,2]])
- assert_equal(r, [[1],[2]],`r`)
+ assert_equal(r, [[1],[2]],repr(r))
r = self.module.trans([[1,2,3],[4,5,6]])
- assert_equal(r, [[1,4],[2,5],[3,6]],`r`)
+ assert_equal(r, [[1,4],[2,5],[3,6]],repr(r))
@dec.slow
def test_flatten(self):
r = self.module.flatten([[1,2]])
- assert_equal(r, [1,2],`r`)
+ assert_equal(r, [1,2],repr(r))
r = self.module.flatten([[1,2,3],[4,5,6]])
- assert_equal(r, [1,2,3,4,5,6],`r`)
+ assert_equal(r, [1,2,3,4,5,6],repr(r))
if __name__ == "__main__":
import nose
View Lorry Controller Status