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.py282
-rw-r--r--numpy/f2py/tests/test_assumed_shape.py22
-rw-r--r--numpy/f2py/tests/test_callback.py32
-rw-r--r--numpy/f2py/tests/test_kind.py4
-rw-r--r--numpy/f2py/tests/test_return_character.py18
-rw-r--r--numpy/f2py/tests/test_return_complex.py24
-rw-r--r--numpy/f2py/tests/test_return_integer.py18
-rw-r--r--numpy/f2py/tests/test_return_logical.py22
-rw-r--r--numpy/f2py/tests/test_return_real.py20
-rw-r--r--numpy/f2py/tests/test_size.py28
10 files changed, 235 insertions, 235 deletions
diff --git a/numpy/f2py/tests/test_array_from_pyobj.py b/numpy/f2py/tests/test_array_from_pyobj.py
index 6707e8d8b..09d613293 100644
--- a/numpy/f2py/tests/test_array_from_pyobj.py
+++ b/numpy/f2py/tests/test_array_from_pyobj.py
@@ -8,7 +8,7 @@ import copy
import nose
from numpy.testing import *
-from numpy import array, alltrue, ndarray, asarray, can_cast,zeros, dtype
+from numpy import array, alltrue, ndarray, asarray, can_cast, zeros, dtype
from numpy.core.multiarray import typeinfo
import util
@@ -44,12 +44,12 @@ def flags_info(arr):
def flags2names(flags):
info = []
- for flagname in ['CONTIGUOUS','FORTRAN','OWNDATA','ENSURECOPY',
- 'ENSUREARRAY','ALIGNED','NOTSWAPPED','WRITEABLE',
- 'UPDATEIFCOPY','BEHAVED','BEHAVED_RO',
- 'CARRAY','FARRAY'
+ for flagname in ['CONTIGUOUS', 'FORTRAN', 'OWNDATA', 'ENSURECOPY',
+ 'ENSUREARRAY', 'ALIGNED', 'NOTSWAPPED', 'WRITEABLE',
+ 'UPDATEIFCOPY', 'BEHAVED', 'BEHAVED_RO',
+ 'CARRAY', 'FARRAY'
]:
- if abs(flags) & getattr(wrap,flagname, 0):
+ if abs(flags) & getattr(wrap, flagname, 0):
info.append(flagname)
return info
@@ -61,9 +61,9 @@ class Intent(object):
if i=='optional':
flags |= wrap.F2PY_OPTIONAL
else:
- flags |= getattr(wrap,'F2PY_INTENT_'+i.upper())
+ flags |= getattr(wrap, 'F2PY_INTENT_'+i.upper())
self.flags = flags
- def __getattr__(self,name):
+ def __getattr__(self, name):
name = name.lower()
if name=='in_': name='in'
return self.__class__(self.intent_list+[name])
@@ -82,9 +82,9 @@ class Intent(object):
intent = Intent()
class Type(object):
- _type_names = ['BOOL','BYTE','UBYTE','SHORT','USHORT','INT','UINT',
- 'LONG','ULONG','LONGLONG','ULONGLONG',
- 'FLOAT','DOUBLE','LONGDOUBLE','CFLOAT','CDOUBLE',
+ _type_names = ['BOOL', 'BYTE', 'UBYTE', 'SHORT', 'USHORT', 'INT', 'UINT',
+ 'LONG', 'ULONG', 'LONGLONG', 'ULONGLONG',
+ 'FLOAT', 'DOUBLE', 'LONGDOUBLE', 'CFLOAT', 'CDOUBLE',
'CLONGDOUBLE']
_type_cache = {}
@@ -93,10 +93,10 @@ class Type(object):
_cast_dict['UBYTE'] = _cast_dict['BOOL'] + ['UBYTE']
_cast_dict['BYTE'] = ['BYTE']
_cast_dict['UBYTE'] = ['UBYTE']
- _cast_dict['SHORT'] = _cast_dict['BYTE'] + ['UBYTE','SHORT']
- _cast_dict['USHORT'] = _cast_dict['UBYTE'] + ['BYTE','USHORT']
- _cast_dict['INT'] = _cast_dict['SHORT'] + ['USHORT','INT']
- _cast_dict['UINT'] = _cast_dict['USHORT'] + ['SHORT','UINT']
+ _cast_dict['SHORT'] = _cast_dict['BYTE'] + ['UBYTE', 'SHORT']
+ _cast_dict['USHORT'] = _cast_dict['UBYTE'] + ['BYTE', 'USHORT']
+ _cast_dict['INT'] = _cast_dict['SHORT'] + ['USHORT', 'INT']
+ _cast_dict['UINT'] = _cast_dict['USHORT'] + ['SHORT', 'UINT']
_cast_dict['LONG'] = _cast_dict['INT'] + ['LONG']
_cast_dict['ULONG'] = _cast_dict['UINT'] + ['ULONG']
@@ -104,24 +104,24 @@ class Type(object):
_cast_dict['LONGLONG'] = _cast_dict['LONG'] + ['LONGLONG']
_cast_dict['ULONGLONG'] = _cast_dict['ULONG'] + ['ULONGLONG']
- _cast_dict['FLOAT'] = _cast_dict['SHORT'] + ['USHORT','FLOAT']
- _cast_dict['DOUBLE'] = _cast_dict['INT'] + ['UINT','FLOAT','DOUBLE']
- _cast_dict['LONGDOUBLE'] = _cast_dict['LONG'] + ['ULONG','FLOAT','DOUBLE','LONGDOUBLE']
+ _cast_dict['FLOAT'] = _cast_dict['SHORT'] + ['USHORT', 'FLOAT']
+ _cast_dict['DOUBLE'] = _cast_dict['INT'] + ['UINT', 'FLOAT', 'DOUBLE']
+ _cast_dict['LONGDOUBLE'] = _cast_dict['LONG'] + ['ULONG', 'FLOAT', 'DOUBLE', 'LONGDOUBLE']
_cast_dict['CFLOAT'] = _cast_dict['FLOAT'] + ['CFLOAT']
- _cast_dict['CDOUBLE'] = _cast_dict['DOUBLE'] + ['CFLOAT','CDOUBLE']
- _cast_dict['CLONGDOUBLE'] = _cast_dict['LONGDOUBLE'] + ['CFLOAT','CDOUBLE','CLONGDOUBLE']
+ _cast_dict['CDOUBLE'] = _cast_dict['DOUBLE'] + ['CFLOAT', 'CDOUBLE']
+ _cast_dict['CLONGDOUBLE'] = _cast_dict['LONGDOUBLE'] + ['CFLOAT', 'CDOUBLE', 'CLONGDOUBLE']
- def __new__(cls,name):
- if isinstance(name,dtype):
+ def __new__(cls, name):
+ if isinstance(name, dtype):
dtype0 = name
name = None
- for n,i in typeinfo.items():
- if isinstance(i,tuple) and dtype0.type is i[-1]:
+ for n, i in typeinfo.items():
+ if isinstance(i, tuple) and dtype0.type is i[-1]:
name = n
break
- obj = cls._type_cache.get(name.upper(),None)
+ obj = cls._type_cache.get(name.upper(), None)
if obj is not None:
return obj
obj = object.__new__(cls)
@@ -129,10 +129,10 @@ class Type(object):
cls._type_cache[name.upper()] = obj
return obj
- def _init(self,name):
+ def _init(self, name):
self.NAME = name.upper()
- self.type_num = getattr(wrap,'NPY_'+self.NAME)
- assert_equal(self.type_num,typeinfo[self.NAME][1])
+ self.type_num = getattr(wrap, 'NPY_'+self.NAME)
+ assert_equal(self.type_num, typeinfo[self.NAME][1])
self.dtype = typeinfo[self.NAME][-1]
self.elsize = typeinfo[self.NAME][2] / 8
self.dtypechar = typeinfo[self.NAME][0]
@@ -169,7 +169,7 @@ class Type(object):
return types
class Array(object):
- def __init__(self,typ,dims,intent,obj):
+ def __init__(self, typ, dims, intent, obj):
self.type = typ
self.dims = dims
self.intent = intent
@@ -177,16 +177,16 @@ class Array(object):
self.obj = obj
# arr.dtypechar may be different from typ.dtypechar
- self.arr = wrap.call(typ.type_num,dims,intent.flags,obj)
+ self.arr = wrap.call(typ.type_num, dims, intent.flags, obj)
- assert_(isinstance(self.arr, ndarray),repr(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'],repr((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),repr(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, \
- repr((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,26 +227,26 @@ 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],\
- repr((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:],\
- repr((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],\
- 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
+ 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,\
- repr((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,\
- repr((self.arr_attr[5][3],self.type.elsize)))
- assert_(self.arr_equal(self.pyarr,self.arr))
+ repr((self.arr_attr[5][3], self.type.elsize)))
+ assert_(self.arr_equal(self.pyarr, self.arr))
- if isinstance(self.obj,ndarray):
+ if isinstance(self.obj, ndarray):
if typ.elsize==Type(obj.dtype).elsize:
if not intent.is_intent('copy') and self.arr_attr[1]<=1:
assert_(self.has_shared_memory())
- def arr_equal(self,arr1,arr2):
+ def arr_equal(self, arr1, arr2):
if arr1.shape != arr2.shape:
return False
s = arr1==arr2
@@ -260,7 +260,7 @@ class Array(object):
"""
if self.obj is self.arr:
return True
- if not isinstance(self.obj,ndarray):
+ if not isinstance(self.obj, ndarray):
return False
obj_attr = wrap.array_attrs(self.obj)
return obj_attr[0]==self.arr_attr[0]
@@ -269,36 +269,36 @@ class Array(object):
class test_intent(unittest.TestCase):
def test_in_out(self):
- assert_equal(str(intent.in_.out),'intent(in,out)')
+ assert_equal(str(intent.in_.out), 'intent(in,out)')
assert_(intent.in_.c.is_intent('c'))
assert_(not intent.in_.c.is_intent_exact('c'))
- assert_(intent.in_.c.is_intent_exact('c','in'))
- assert_(intent.in_.c.is_intent_exact('in','c'))
+ assert_(intent.in_.c.is_intent_exact('c', 'in'))
+ assert_(intent.in_.c.is_intent_exact('in', 'c'))
assert_(not intent.in_.is_intent('c'))
class _test_shared_memory:
- num2seq = [1,2]
- num23seq = [[1,2,3],[4,5,6]]
+ num2seq = [1, 2]
+ num23seq = [[1, 2, 3], [4, 5, 6]]
def test_in_from_2seq(self):
- a = self.array([2],intent.in_,self.num2seq)
+ a = self.array([2], intent.in_, self.num2seq)
assert_(not a.has_shared_memory())
def test_in_from_2casttype(self):
for t in self.type.cast_types():
- obj = array(self.num2seq,dtype=t.dtype)
- a = self.array([len(self.num2seq)],intent.in_,obj)
+ 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(),repr((self.type.dtype,t.dtype)))
+ assert_(a.has_shared_memory(), repr((self.type.dtype, t.dtype)))
else:
- assert_(not a.has_shared_memory(),repr(t.dtype))
+ assert_(not a.has_shared_memory(), repr(t.dtype))
def test_inout_2seq(self):
- obj = array(self.num2seq,dtype=self.type.dtype)
- a = self.array([len(self.num2seq)],intent.inout,obj)
+ obj = array(self.num2seq, dtype=self.type.dtype)
+ a = self.array([len(self.num2seq)], intent.inout, obj)
assert_(a.has_shared_memory())
try:
- a = self.array([2],intent.in_.inout,self.num2seq)
+ a = self.array([2], intent.in_.inout, self.num2seq)
except TypeError as msg:
if not str(msg).startswith('failed to initialize intent(inout|inplace|cache) array'):
raise
@@ -306,15 +306,15 @@ class _test_shared_memory:
raise SystemError('intent(inout) should have failed on sequence')
def test_f_inout_23seq(self):
- obj = array(self.num23seq,dtype=self.type.dtype,order='F')
- shape = (len(self.num23seq),len(self.num23seq[0]))
- a = self.array(shape,intent.in_.inout,obj)
+ obj = array(self.num23seq, dtype=self.type.dtype, order='F')
+ shape = (len(self.num23seq), len(self.num23seq[0]))
+ a = self.array(shape, intent.in_.inout, obj)
assert_(a.has_shared_memory())
- obj = array(self.num23seq,dtype=self.type.dtype,order='C')
- shape = (len(self.num23seq),len(self.num23seq[0]))
+ obj = array(self.num23seq, dtype=self.type.dtype, order='C')
+ shape = (len(self.num23seq), len(self.num23seq[0]))
try:
- a = self.array(shape,intent.in_.inout,obj)
+ a = self.array(shape, intent.in_.inout, obj)
except ValueError as msg:
if not str(msg).startswith('failed to initialize intent(inout) array'):
raise
@@ -322,84 +322,84 @@ class _test_shared_memory:
raise SystemError('intent(inout) should have failed on improper array')
def test_c_inout_23seq(self):
- obj = array(self.num23seq,dtype=self.type.dtype)
- shape = (len(self.num23seq),len(self.num23seq[0]))
- a = self.array(shape,intent.in_.c.inout,obj)
+ obj = array(self.num23seq, dtype=self.type.dtype)
+ shape = (len(self.num23seq), len(self.num23seq[0]))
+ a = self.array(shape, intent.in_.c.inout, obj)
assert_(a.has_shared_memory())
def test_in_copy_from_2casttype(self):
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(),repr(t.dtype))
+ obj = array(self.num2seq, dtype=t.dtype)
+ a = self.array([len(self.num2seq)], intent.in_.copy, obj)
+ 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])],
- intent.in_,self.num23seq)
+ a = self.array([len(self.num23seq), len(self.num23seq[0])],
+ intent.in_, self.num23seq)
assert_(not a.has_shared_memory())
def test_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_,obj)
- assert_(not a.has_shared_memory(),repr(t.dtype))
+ 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(), repr(t.dtype))
def test_f_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_,obj)
+ obj = array(self.num23seq, dtype=t.dtype, order='F')
+ a = self.array([len(self.num23seq), len(self.num23seq[0])],
+ intent.in_, obj)
if t.elsize==self.type.elsize:
- assert_(a.has_shared_memory(),repr(t.dtype))
+ assert_(a.has_shared_memory(), repr(t.dtype))
else:
- assert_(not a.has_shared_memory(),repr(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():
- obj = array(self.num23seq,dtype=t.dtype)
- a = self.array([len(self.num23seq),len(self.num23seq[0])],
- intent.in_.c,obj)
+ obj = array(self.num23seq, dtype=t.dtype)
+ 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(),repr(t.dtype))
+ assert_(a.has_shared_memory(), repr(t.dtype))
else:
- assert_(not a.has_shared_memory(),repr(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(),repr(t.dtype))
+ 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(), 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(),repr(t.dtype))
+ 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(), repr(t.dtype))
def test_in_cache_from_2casttype(self):
for t in self.type.all_types():
if t.elsize != self.type.elsize:
continue
- obj = array(self.num2seq,dtype=t.dtype)
+ 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(),repr(t.dtype))
+ a = self.array(shape, intent.in_.c.cache, obj)
+ assert_(a.has_shared_memory(), repr(t.dtype))
- a = self.array(shape,intent.in_.cache,obj)
- assert_(a.has_shared_memory(),repr(t.dtype))
+ a = self.array(shape, intent.in_.cache, obj)
+ 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(),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(), repr(t.dtype))
- a = self.array(shape,intent.in_.cache,obj)
- assert_(a.has_shared_memory(),repr(t.dtype))
+ a = self.array(shape, intent.in_.cache, obj)
+ assert_(a.has_shared_memory(), repr(t.dtype))
try:
- a = self.array(shape,intent.in_.cache,obj[::-1])
+ a = self.array(shape, intent.in_.cache, obj[::-1])
except ValueError as msg:
if not str(msg).startswith('failed to initialize intent(cache) array'):
raise
@@ -409,10 +409,10 @@ class _test_shared_memory:
for t in self.type.all_types():
if t.elsize >= self.type.elsize:
continue
- obj = array(self.num2seq,dtype=t.dtype)
+ obj = array(self.num2seq, dtype=t.dtype)
shape = (len(self.num2seq),)
try:
- a = self.array(shape,intent.in_.cache,obj)
+ a = self.array(shape, intent.in_.cache, obj)
except ValueError as msg:
if not str(msg).startswith('failed to initialize intent(cache) array'):
raise
@@ -421,16 +421,16 @@ class _test_shared_memory:
def test_cache_hidden(self):
shape = (2,)
- a = self.array(shape,intent.cache.hide,None)
+ a = self.array(shape, intent.cache.hide, None)
assert_(a.arr.shape==shape)
- shape = (2,3)
- a = self.array(shape,intent.cache.hide,None)
+ shape = (2, 3)
+ a = self.array(shape, intent.cache.hide, None)
assert_(a.arr.shape==shape)
- shape = (-1,3)
+ shape = (-1, 3)
try:
- a = self.array(shape,intent.cache.hide,None)
+ a = self.array(shape, intent.cache.hide, None)
except ValueError as msg:
if not str(msg).startswith('failed to create intent(cache|hide)|optional array'):
raise
@@ -439,25 +439,25 @@ class _test_shared_memory:
def test_hidden(self):
shape = (2,)
- a = self.array(shape,intent.hide,None)
+ a = self.array(shape, intent.hide, None)
assert_(a.arr.shape==shape)
- assert_(a.arr_equal(a.arr,zeros(shape,dtype=self.type.dtype)))
+ assert_(a.arr_equal(a.arr, zeros(shape, dtype=self.type.dtype)))
- shape = (2,3)
- a = self.array(shape,intent.hide,None)
+ shape = (2, 3)
+ a = self.array(shape, intent.hide, None)
assert_(a.arr.shape==shape)
- assert_(a.arr_equal(a.arr,zeros(shape,dtype=self.type.dtype)))
+ assert_(a.arr_equal(a.arr, zeros(shape, dtype=self.type.dtype)))
assert_(a.arr.flags['FORTRAN'] and not a.arr.flags['CONTIGUOUS'])
- shape = (2,3)
- a = self.array(shape,intent.c.hide,None)
+ shape = (2, 3)
+ a = self.array(shape, intent.c.hide, None)
assert_(a.arr.shape==shape)
- assert_(a.arr_equal(a.arr,zeros(shape,dtype=self.type.dtype)))
+ assert_(a.arr_equal(a.arr, zeros(shape, dtype=self.type.dtype)))
assert_(not a.arr.flags['FORTRAN'] and a.arr.flags['CONTIGUOUS'])
- shape = (-1,3)
+ shape = (-1, 3)
try:
- a = self.array(shape,intent.hide,None)
+ a = self.array(shape, intent.hide, None)
except ValueError as msg:
if not str(msg).startswith('failed to create intent(cache|hide)|optional array'):
raise
@@ -466,48 +466,48 @@ class _test_shared_memory:
def test_optional_none(self):
shape = (2,)
- a = self.array(shape,intent.optional,None)
+ a = self.array(shape, intent.optional, None)
assert_(a.arr.shape==shape)
- assert_(a.arr_equal(a.arr,zeros(shape,dtype=self.type.dtype)))
+ assert_(a.arr_equal(a.arr, zeros(shape, dtype=self.type.dtype)))
- shape = (2,3)
- a = self.array(shape,intent.optional,None)
+ shape = (2, 3)
+ a = self.array(shape, intent.optional, None)
assert_(a.arr.shape==shape)
- assert_(a.arr_equal(a.arr,zeros(shape,dtype=self.type.dtype)))
+ assert_(a.arr_equal(a.arr, zeros(shape, dtype=self.type.dtype)))
assert_(a.arr.flags['FORTRAN'] and not a.arr.flags['CONTIGUOUS'])
- shape = (2,3)
- a = self.array(shape,intent.c.optional,None)
+ shape = (2, 3)
+ a = self.array(shape, intent.c.optional, None)
assert_(a.arr.shape==shape)
- assert_(a.arr_equal(a.arr,zeros(shape,dtype=self.type.dtype)))
+ assert_(a.arr_equal(a.arr, zeros(shape, dtype=self.type.dtype)))
assert_(not a.arr.flags['FORTRAN'] and a.arr.flags['CONTIGUOUS'])
def test_optional_from_2seq(self):
obj = self.num2seq
shape = (len(obj),)
- a = self.array(shape,intent.optional,obj)
+ a = self.array(shape, intent.optional, obj)
assert_(a.arr.shape==shape)
assert_(not a.has_shared_memory())
def test_optional_from_23seq(self):
obj = self.num23seq
- shape = (len(obj),len(obj[0]))
- a = self.array(shape,intent.optional,obj)
+ shape = (len(obj), len(obj[0]))
+ a = self.array(shape, intent.optional, obj)
assert_(a.arr.shape==shape)
assert_(not a.has_shared_memory())
- a = self.array(shape,intent.optional.c,obj)
+ a = self.array(shape, intent.optional.c, obj)
assert_(a.arr.shape==shape)
assert_(not a.has_shared_memory())
def test_inplace(self):
- obj = array(self.num23seq,dtype=self.type.dtype)
+ obj = array(self.num23seq, dtype=self.type.dtype)
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],repr((obj,a.arr)))
+ a = self.array(shape, intent.inplace, obj)
+ 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),repr((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'])
@@ -516,15 +516,15 @@ class _test_shared_memory:
for t in self.type.cast_types():
if t is self.type:
continue
- obj = array(self.num23seq,dtype=t.dtype)
+ obj = array(self.num23seq, dtype=t.dtype)
assert_(obj.dtype.type==t.dtype)
assert_(obj.dtype.type is not self.type.dtype)
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],repr((obj,a.arr)))
+ a = self.array(shape, intent.inplace, obj)
+ 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),repr((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'])
@@ -539,7 +539,7 @@ class test_%s_gen(unittest.TestCase,
def setUp(self):
self.type = Type(%r)
array = lambda self,dims,intent,obj: Array(Type(%r),dims,intent,obj)
-''' % (t,t,t))
+''' % (t, t, t))
if __name__ == "__main__":
setup()
diff --git a/numpy/f2py/tests/test_assumed_shape.py b/numpy/f2py/tests/test_assumed_shape.py
index 6c0ea9ebd..d6beaee63 100644
--- a/numpy/f2py/tests/test_assumed_shape.py
+++ b/numpy/f2py/tests/test_assumed_shape.py
@@ -20,17 +20,17 @@ class TestAssumedShapeSumExample(util.F2PyTest):
@dec.slow
def test_all(self):
- r = self.module.fsum([1,2])
- assert_(r==3,repr(r))
- r = self.module.sum([1,2])
- assert_(r==3,repr(r))
- r = self.module.sum_with_use([1,2])
- assert_(r==3,repr(r))
-
- r = self.module.mod.sum([1,2])
- assert_(r==3,repr(r))
- r = self.module.mod.fsum([1,2])
- assert_(r==3,repr(r))
+ r = self.module.fsum([1, 2])
+ assert_(r==3, repr(r))
+ r = self.module.sum([1, 2])
+ assert_(r==3, repr(r))
+ r = self.module.sum_with_use([1, 2])
+ assert_(r==3, repr(r))
+
+ r = self.module.mod.sum([1, 2])
+ assert_(r==3, repr(r))
+ r = self.module.mod.fsum([1, 2])
+ 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 7a7e8bc11..98a90a28c 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,repr(r))
- r = t(lambda a:5,fun_extra_args=(6,))
- assert_( r==5,repr(r))
- r = t(lambda a:a,fun_extra_args=(6,))
- assert_( r==6,repr(r))
- r = t(lambda a:5+a,fun_extra_args=(7,))
- assert_( r==12,repr(r))
- r = t(lambda a:math.degrees(a),fun_extra_args=(math.pi,))
- assert_( r==180,repr(r))
- r = t(math.degrees,fun_extra_args=(math.pi,))
- assert_( r==180,repr(r))
+ assert_( r==4, repr(r))
+ r = t(lambda a:5, fun_extra_args=(6,))
+ assert_( r==5, repr(r))
+ r = t(lambda a:a, fun_extra_args=(6,))
+ assert_( r==6, repr(r))
+ r = t(lambda a:5+a, fun_extra_args=(7,))
+ assert_( r==12, repr(r))
+ r = t(lambda a:math.degrees(a), fun_extra_args=(math.pi,))
+ assert_( r==180, repr(r))
+ r = t(math.degrees, fun_extra_args=(math.pi,))
+ assert_( r==180, repr(r))
r = t(self.module.func, fun_extra_args=(6,))
- assert_( r==17,repr(r))
+ assert_( r==17, repr(r))
r = t(self.module.func0)
- assert_( r==11,repr(r))
+ assert_( r==11, repr(r))
r = t(self.module.func0._cpointer)
- assert_( r==11,repr(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,repr(r))
+ assert_( r==7, repr(r))
r = t(a.mth)
- assert_( r==9,repr(r))
+ assert_( r==9, repr(r))
if __name__ == "__main__":
import nose
diff --git a/numpy/f2py/tests/test_kind.py b/numpy/f2py/tests/test_kind.py
index 493c06942..f96fbffdb 100644
--- a/numpy/f2py/tests/test_kind.py
+++ b/numpy/f2py/tests/test_kind.py
@@ -24,11 +24,11 @@ class TestKind(util.F2PyTest):
selectedintkind = self.module.selectedintkind
for i in range(40):
- assert_(selectedintkind(i) in [selected_int_kind(i),-1],\
+ assert_(selectedintkind(i) in [selected_int_kind(i), -1],\
'selectedintkind(%s): expected %r but got %r' % (i, selected_int_kind(i), selectedintkind(i)))
for i in range(20):
- assert_(selectedrealkind(i) in [selected_real_kind(i),-1],\
+ assert_(selectedrealkind(i) in [selected_real_kind(i), -1],\
'selectedrealkind(%s): expected %r but got %r' % (i, selected_real_kind(i), selectedrealkind(i)))
if __name__ == "__main__":
diff --git a/numpy/f2py/tests/test_return_character.py b/numpy/f2py/tests/test_return_character.py
index 213730008..0865d54b3 100644
--- a/numpy/f2py/tests/test_return_character.py
+++ b/numpy/f2py/tests/test_return_character.py
@@ -8,19 +8,19 @@ import util
class TestReturnCharacter(util.F2PyTest):
def check_function(self, t):
tname = t.__doc__.split()[0]
- if tname in ['t0','t1','s0','s1']:
+ if tname in ['t0', 't1', 's0', 's1']:
assert_( t(23)==asbytes('2'))
- 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))
+ 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 '),repr(t(23)))
+ elif tname in ['ts', 'ss']:
+ assert_( t(23)==asbytes('23 '), repr(t(23)))
assert_( t('123456789abcdef')==asbytes('123456789a'))
- elif tname in ['t5','s5']:
- assert_( t(23)==asbytes('23 '),repr(t(23)))
- assert_( t('ab')==asbytes('ab '),repr(t('ab')))
+ elif tname in ['t5', 's5']:
+ 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 f03416648..d144cecf1 100644
--- a/numpy/f2py/tests/test_return_complex.py
+++ b/numpy/f2py/tests/test_return_complex.py
@@ -8,7 +8,7 @@ import util
class TestReturnComplex(util.F2PyTest):
def check_function(self, t):
tname = t.__doc__.split()[0]
- if tname in ['t0','t8','s0','s8']:
+ if tname in ['t0', 't8', 's0', 's8']:
err = 1e-5
else:
err = 0.0
@@ -22,18 +22,18 @@ class TestReturnComplex(util.F2PyTest):
assert_( abs(t([234])-234.)<=err)
assert_( abs(t((234,))-234.)<=err)
assert_( abs(t(array(234))-234.)<=err)
- assert_( abs(t(array(23+4j,'F'))-(23+4j))<=err)
+ assert_( abs(t(array(23+4j, 'F'))-(23+4j))<=err)
assert_( abs(t(array([234]))-234.)<=err)
assert_( abs(t(array([[234]]))-234.)<=err)
- assert_( abs(t(array([234],'b'))+22.)<=err)
- assert_( abs(t(array([234],'h'))-234.)<=err)
- assert_( abs(t(array([234],'i'))-234.)<=err)
- assert_( abs(t(array([234],'l'))-234.)<=err)
- assert_( abs(t(array([234],'q'))-234.)<=err)
- assert_( abs(t(array([234],'f'))-234.)<=err)
- assert_( abs(t(array([234],'d'))-234.)<=err)
- assert_( abs(t(array([234+3j],'F'))-(234+3j))<=err)
- assert_( abs(t(array([234],'D'))-234.)<=err)
+ assert_( abs(t(array([234], 'b'))+22.)<=err)
+ assert_( abs(t(array([234], 'h'))-234.)<=err)
+ assert_( abs(t(array([234], 'i'))-234.)<=err)
+ assert_( abs(t(array([234], 'l'))-234.)<=err)
+ assert_( abs(t(array([234], 'q'))-234.)<=err)
+ assert_( abs(t(array([234], 'f'))-234.)<=err)
+ assert_( abs(t(array([234], 'd'))-234.)<=err)
+ assert_( abs(t(array([234+3j], 'F'))-(234+3j))<=err)
+ assert_( abs(t(array([234], 'D'))-234.)<=err)
#assert_raises(TypeError, t, array([234], 'a1'))
assert_raises(TypeError, t, 'abc')
@@ -46,7 +46,7 @@ class TestReturnComplex(util.F2PyTest):
try:
r = t(10**400)
- assert_( repr(r) in ['(inf+0j)','(Infinity+0j)'],repr(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 d19653f4d..056466208 100644
--- a/numpy/f2py/tests/test_return_integer.py
+++ b/numpy/f2py/tests/test_return_integer.py
@@ -7,7 +7,7 @@ import util
class TestReturnInteger(util.F2PyTest):
def check_function(self, t):
- assert_( t(123)==123,repr(t(123)))
+ assert_( t(123)==123, repr(t(123)))
assert_( t(123.6)==123)
assert_( t(long(123))==123)
assert_( t('123')==123)
@@ -17,13 +17,13 @@ class TestReturnInteger(util.F2PyTest):
assert_( t(array(123))==123)
assert_( t(array([123]))==123)
assert_( t(array([[123]]))==123)
- assert_( t(array([123],'b'))==123)
- assert_( t(array([123],'h'))==123)
- assert_( t(array([123],'i'))==123)
- assert_( t(array([123],'l'))==123)
- assert_( t(array([123],'B'))==123)
- assert_( t(array([123],'f'))==123)
- assert_( t(array([123],'d'))==123)
+ assert_( t(array([123], 'b'))==123)
+ assert_( t(array([123], 'h'))==123)
+ assert_( t(array([123], 'i'))==123)
+ assert_( t(array([123], 'l'))==123)
+ assert_( t(array([123], 'B'))==123)
+ assert_( t(array([123], 'f'))==123)
+ assert_( t(array([123], 'd'))==123)
#assert_raises(ValueError, t, array([123],'S3'))
assert_raises(ValueError, t, 'abc')
@@ -34,7 +34,7 @@ class TestReturnInteger(util.F2PyTest):
assert_raises(Exception, t, t)
assert_raises(Exception, t, {})
- if t.__doc__.split()[0] in ['t8','s8']:
+ if t.__doc__.split()[0] in ['t8', 's8']:
assert_raises(OverflowError, t, 100000000000000000000000)
assert_raises(OverflowError, t, 10000000011111111111111.23)
diff --git a/numpy/f2py/tests/test_return_logical.py b/numpy/f2py/tests/test_return_logical.py
index 3823e5642..82f86b67f 100644
--- a/numpy/f2py/tests/test_return_logical.py
+++ b/numpy/f2py/tests/test_return_logical.py
@@ -7,8 +7,8 @@ import util
class TestReturnLogical(util.F2PyTest):
def check_function(self, t):
- assert_( t(True)==1,repr(t(True)))
- assert_( t(False)==0,repr(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)
@@ -32,20 +32,20 @@ class TestReturnLogical(util.F2PyTest):
assert_( t(array(234))==1)
assert_( t(array([234]))==1)
assert_( t(array([[234]]))==1)
- assert_( t(array([234],'b'))==1)
- assert_( t(array([234],'h'))==1)
- assert_( t(array([234],'i'))==1)
- assert_( t(array([234],'l'))==1)
- assert_( t(array([234],'f'))==1)
- assert_( t(array([234],'d'))==1)
- assert_( t(array([234+3j],'F'))==1)
- assert_( t(array([234],'D'))==1)
+ assert_( t(array([234], 'b'))==1)
+ assert_( t(array([234], 'h'))==1)
+ assert_( t(array([234], 'i'))==1)
+ assert_( t(array([234], 'l'))==1)
+ assert_( t(array([234], 'f'))==1)
+ assert_( t(array([234], 'd'))==1)
+ assert_( t(array([234+3j], 'F'))==1)
+ assert_( t(array([234], 'D'))==1)
assert_( t(array(0))==0)
assert_( t(array([0]))==0)
assert_( t(array([[0]]))==0)
assert_( t(array([0j]))==0)
assert_( t(array([1]))==1)
- assert_raises(ValueError, t, array([0,0]))
+ assert_raises(ValueError, t, array([0, 0]))
class TestF77ReturnLogical(TestReturnLogical):
diff --git a/numpy/f2py/tests/test_return_real.py b/numpy/f2py/tests/test_return_real.py
index 3286e11f2..f9a09f620 100644
--- a/numpy/f2py/tests/test_return_real.py
+++ b/numpy/f2py/tests/test_return_real.py
@@ -8,7 +8,7 @@ import util
class TestReturnReal(util.F2PyTest):
def check_function(self, t):
- if t.__doc__.split()[0] in ['t0','t4','s0','s4']:
+ if t.__doc__.split()[0] in ['t0', 't4', 's0', 's4']:
err = 1e-5
else:
err = 0.0
@@ -23,14 +23,14 @@ class TestReturnReal(util.F2PyTest):
assert_( abs(t(array(234))-234.)<=err)
assert_( abs(t(array([234]))-234.)<=err)
assert_( abs(t(array([[234]]))-234.)<=err)
- assert_( abs(t(array([234],'b'))+22)<=err)
- assert_( abs(t(array([234],'h'))-234.)<=err)
- assert_( abs(t(array([234],'i'))-234.)<=err)
- assert_( abs(t(array([234],'l'))-234.)<=err)
- assert_( abs(t(array([234],'B'))-234.)<=err)
- assert_( abs(t(array([234],'f'))-234.)<=err)
- assert_( abs(t(array([234],'d'))-234.)<=err)
- if t.__doc__.split()[0] in ['t0','t4','s0','s4']:
+ assert_( abs(t(array([234], 'b'))+22)<=err)
+ assert_( abs(t(array([234], 'h'))-234.)<=err)
+ assert_( abs(t(array([234], 'i'))-234.)<=err)
+ assert_( abs(t(array([234], 'l'))-234.)<=err)
+ assert_( abs(t(array([234], 'B'))-234.)<=err)
+ assert_( abs(t(array([234], 'f'))-234.)<=err)
+ assert_( abs(t(array([234], 'd'))-234.)<=err)
+ if t.__doc__.split()[0] in ['t0', 't4', 's0', 's4']:
assert_( t(1e200)==t(1e300)) # inf
#assert_raises(ValueError, t, array([234], 'S1'))
@@ -44,7 +44,7 @@ class TestReturnReal(util.F2PyTest):
try:
r = t(10**400)
- assert_( repr(r) in ['inf','Infinity'],repr(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 6cc508a19..e4f21b519 100644
--- a/numpy/f2py/tests/test_size.py
+++ b/numpy/f2py/tests/test_size.py
@@ -17,30 +17,30 @@ class TestSizeSumExample(util.F2PyTest):
@dec.slow
def test_all(self):
- r = self.module.foo([[1,2]])
- assert_equal(r, [3],repr(r))
+ r = self.module.foo([[1, 2]])
+ assert_equal(r, [3], repr(r))
- r = self.module.foo([[1,2],[3,4]])
- assert_equal(r, [3,7],repr(r))
+ r = self.module.foo([[1, 2], [3, 4]])
+ assert_equal(r, [3, 7], repr(r))
- r = self.module.foo([[1,2],[3,4],[5,6]])
- assert_equal(r, [3,7,11],repr(r))
+ r = self.module.foo([[1, 2], [3, 4], [5, 6]])
+ 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]],repr(r))
+ r = self.module.trans([[1, 2]])
+ 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]],repr(r))
+ r = self.module.trans([[1, 2, 3], [4, 5, 6]])
+ 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],repr(r))
+ r = self.module.flatten([[1, 2]])
+ 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],repr(r))
+ r = self.module.flatten([[1, 2, 3], [4, 5, 6]])
+ assert_equal(r, [1, 2, 3, 4, 5, 6], repr(r))
if __name__ == "__main__":
import nose
View Lorry Controller Status