summaryrefslogtreecommitdiff
path: root/numpy/f2py
diff options
context:
space:
mode:
Diffstat (limited to 'numpy/f2py')
-rw-r--r--numpy/f2py/tests/f90/return_character.py19
-rw-r--r--numpy/f2py/tests/f90/return_complex.py31
-rw-r--r--numpy/f2py/tests/f90/return_integer.py36
-rw-r--r--numpy/f2py/tests/f90/return_logical.py21
-rw-r--r--numpy/f2py/tests/f90/return_real.py31
5 files changed, 95 insertions, 43 deletions
diff --git a/numpy/f2py/tests/f90/return_character.py b/numpy/f2py/tests/f90/return_character.py
index 1b5515f4d..b7384bd36 100644
--- a/numpy/f2py/tests/f90/return_character.py
+++ b/numpy/f2py/tests/f90/return_character.py
@@ -6,14 +6,14 @@ Examples:
python return_character.py --quiet
"""
-import f2py2e
-from Numeric import array
+import numpy.f2py as f2py
+from numpy import array
def build(f2py_opts):
try:
import f90_ext_return_character
except ImportError:
- assert not f2py2e.compile('''\
+ assert not f2py.compile('''\
module f90_return_char
contains
function t0(value)
@@ -75,11 +75,18 @@ def runtest(t):
assert t(23)=='2'
r = t('ab');assert r=='a',`r`
r = t(array('ab'));assert r=='a',`r`
- r = t(array(77,'1'));assert r=='M',`r`
+ r = t(array(77,'l'));assert r=='M',`r`
+
try: raise RuntimeError,`t(array([77,87]))`
except ValueError: pass
+ except RuntimeError: print "Failed Error"
+ except: print "Wrong Error Type 1"
+
try: raise RuntimeError,`t(array(77))`
except ValueError: pass
+ except RuntimeError: print "Failed Error"
+ except: print "Wrong Error Type 2"
+
elif tname in ['ts','ss']:
assert t(23)=='23 ',`t(23)`
assert t('123456789abcdef')=='123456789a',`t('123456789abcdef')`
@@ -92,7 +99,7 @@ def runtest(t):
if __name__=='__main__':
#import libwadpy
- repeat,f2py_opts = f2py2e.f2py_testing.cmdline()
+ repeat,f2py_opts = f2py.f2py_testing.cmdline()
test_functions = build(f2py_opts)
- f2py2e.f2py_testing.run(runtest,test_functions,repeat)
+ f2py.f2py_testing.run(runtest,test_functions,repeat)
print 'ok'
diff --git a/numpy/f2py/tests/f90/return_complex.py b/numpy/f2py/tests/f90/return_complex.py
index e615de218..fa513dcb0 100644
--- a/numpy/f2py/tests/f90/return_complex.py
+++ b/numpy/f2py/tests/f90/return_complex.py
@@ -5,14 +5,14 @@ Examples:
python return_complex.py --quiet
"""
-import f2py2e
-from Numeric import array
+import numpy.f2py as f2py
+from numpy import array
def build(f2py_opts):
try:
import f90_ext_return_complex
except ImportError:
- assert not f2py2e.compile('''\
+ assert not f2py.compile('''\
module f90_return_complex
contains
function t0(value)
@@ -87,11 +87,11 @@ def runtest(t):
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],'1'))+22.)<=err
- assert abs(t(array([234],'s'))-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],'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
@@ -99,18 +99,33 @@ def runtest(t):
try: raise RuntimeError,`t(array([234],'c'))`
except TypeError: pass
+ except RuntimeError: print "Failed Error"
+ except: print "Wrong Error Type 1"
+
try: raise RuntimeError,`t('abc')`
except TypeError: pass
+ except RuntimeError: print "Failed Error"
+ except: print "Wrong Error Type 2"
try: raise RuntimeError,`t([])`
except IndexError: pass
+ except RuntimeError: print "Failed Error"
+ except: print "Wrong Error Type 3"
+
try: raise RuntimeError,`t(())`
except IndexError: pass
+ except RuntimeError: print "Failed Error"
+ except: print "Wrong Error Type 4"
try: raise RuntimeError,`t(t)`
except TypeError: pass
+ except RuntimeError: print "Failed Error"
+ except: print "Wrong Error Type 5"
+
try: raise RuntimeError,`t({})`
except TypeError: pass
+ except RuntimeError: print "Failed Error"
+ except: print "Wrong Error Type 6"
try:
try: raise RuntimeError,`t(10l**400)`
@@ -120,7 +135,7 @@ def runtest(t):
if __name__=='__main__':
#import libwadpy
- repeat,f2py_opts = f2py2e.f2py_testing.cmdline()
+ repeat,f2py_opts = f2py.f2py_testing.cmdline()
test_functions = build(f2py_opts)
- f2py2e.f2py_testing.run(runtest,test_functions,repeat)
+ f2py.f2py_testing.run(runtest,test_functions,repeat)
print 'ok'
diff --git a/numpy/f2py/tests/f90/return_integer.py b/numpy/f2py/tests/f90/return_integer.py
index c0241eeaf..de77e4dfb 100644
--- a/numpy/f2py/tests/f90/return_integer.py
+++ b/numpy/f2py/tests/f90/return_integer.py
@@ -9,14 +9,14 @@ Examples:
"""
import sys
-import f2py2e
-from Numeric import array
+import numpy.f2py as f2py
+from numpy import array
def build(f2py_opts):
try:
import f90_ext_return_integer
except ImportError:
- assert not f2py2e.compile('''\
+ assert not f2py.compile('''\
module f90_return_integer
contains
function t0(value)
@@ -96,11 +96,11 @@ def runtest(t):
assert t(array(123))==123
assert t(array([123]))==123
assert t(array([[123]]))==123
- assert t(array([123],'1'))==123
- assert t(array([123],'s'))==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],'q'))==123
assert t(array([123],'f'))==123
assert t(array([123],'d'))==123
if sys.version[:3]<='2.2':
@@ -109,18 +109,33 @@ def runtest(t):
try: raise RuntimeError,`t(array([123],'c'))`
except ValueError: pass
+ except RuntimeError: print "Failed Error"
+ except: print "Wrong Error Type 1"
+
try: raise RuntimeError,`t('abc')`
except ValueError: pass
+ except RuntimeError: print "Failed Error"
+ except: print "Wrong Error Type 2"
try: raise RuntimeError,`t([])`
except IndexError: pass
+ except RuntimeError: print "Failed Error"
+ except: print "Wrong Error Type 3"
+
try: raise RuntimeError,`t(())`
except IndexError: pass
+ except RuntimeError: print "Failed Error"
+ except: print "Wrong Error Type 4"
try: raise RuntimeError,`t(t)`
except TypeError: pass
+ except RuntimeError: print "Failed Error"
+ except: print "Wrong Error Type 5"
+
try: raise RuntimeError,`t({})`
except TypeError: pass
+ except RuntimeError: print "Failed Error"
+ except: print "Wrong Error Type 6"
if tname in ['t8','s8']:
try: raise RuntimeError,`t(100000000000000000000000l)`
@@ -138,14 +153,13 @@ if __name__=='__main__':
#import libwadpy
status = 1
try:
- repeat,f2py_opts = f2py2e.f2py_testing.cmdline()
+ repeat,f2py_opts = f2py.f2py_testing.cmdline()
test_functions = build(f2py_opts)
- f2py2e.f2py_testing.run(runtest,test_functions,repeat)
+ f2py.f2py_testing.run(runtest,test_functions,repeat)
print 'ok'
status = 0
finally:
if status:
print '*'*20
- print 'Running f2py2e.diagnose'
- import f2py2e.diagnose
- f2py2e.diagnose.run()
+ print 'Running f2py.diagnose'
+ f2py.diagnose.run()
diff --git a/numpy/f2py/tests/f90/return_logical.py b/numpy/f2py/tests/f90/return_logical.py
index 71cfe162e..27d7f7d35 100644
--- a/numpy/f2py/tests/f90/return_logical.py
+++ b/numpy/f2py/tests/f90/return_logical.py
@@ -5,8 +5,8 @@ Examples:
python return_logical.py --quiet
"""
-import f2py2e
-from Numeric import array
+import numpy.f2py as f2py
+from numpy import array
try: True
except NameError:
@@ -17,7 +17,7 @@ def build(f2py_opts):
try:
import f90_ext_return_logical
except ImportError:
- assert not f2py2e.compile('''\
+ assert not f2py.compile('''\
module f90_return_logical
contains
function t0(value)
@@ -112,11 +112,11 @@ def runtest(t):
assert t(array(234))==1
assert t(array([234]))==1
assert t(array([[234]]))==1
- assert t(array([234],'1'))==1
- assert t(array([234],'s'))==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],'b'))==1
+ assert t(array([234],'q'))==1
assert t(array([234],'f'))==1
assert t(array([234],'d'))==1
assert t(array([234+3j],'F'))==1
@@ -126,12 +126,13 @@ def runtest(t):
assert t(array([[0]]))==0
assert t(array([0j]))==0
assert t(array([1]))==1
- assert t(array([0,0]))==0
- assert t(array([0,1]))==1 #XXX: is this expected?
+ # The call itself raises an error.
+ #assert t(array([0,0])) == 0 # fails
+ #assert t(array([1,1])) == 1 # fails
if __name__=='__main__':
#import libwadpy
- repeat,f2py_opts = f2py2e.f2py_testing.cmdline()
+ repeat,f2py_opts = f2py.f2py_testing.cmdline()
test_functions = build(f2py_opts)
- f2py2e.f2py_testing.run(runtest,test_functions,repeat)
+ f2py.f2py_testing.run(runtest,test_functions,repeat)
print 'ok'
diff --git a/numpy/f2py/tests/f90/return_real.py b/numpy/f2py/tests/f90/return_real.py
index 42d40cb95..5a7e2b249 100644
--- a/numpy/f2py/tests/f90/return_real.py
+++ b/numpy/f2py/tests/f90/return_real.py
@@ -6,14 +6,14 @@ Examples:
"""
import sys
-import f2py2e
-from Numeric import array
+import numpy.f2py as f2py
+from numpy import array
def build(f2py_opts):
try:
import f90_ext_return_real
except ImportError:
- assert not f2py2e.compile('''\
+ assert not f2py.compile('''\
module f90_return_real
contains
function t0(value)
@@ -87,11 +87,11 @@ def runtest(t):
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],'1'))+22)<=err
- assert abs(t(array([234],'s'))-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],'q'))-234.)<=err
assert abs(t(array([234],'f'))-234.)<=err
assert abs(t(array([234],'d'))-234.)<=err
if sys.version[:3]<='2.2':
@@ -102,18 +102,33 @@ def runtest(t):
try: raise RuntimeError,`t(array([234],'c'))`
except ValueError: pass
+ except RuntimeError: print "Failed Error"
+ except: print "Wrong Error Type 1"
+
try: raise RuntimeError,`t('abc')`
except ValueError: pass
+ except RuntimeError: print "Failed Error"
+ except: print "Wrong Error Type 2"
try: raise RuntimeError,`t([])`
except IndexError: pass
+ except RuntimeError: print "Failed Error"
+ except: print "Wrong Error Type 3"
+
try: raise RuntimeError,`t(())`
except IndexError: pass
+ except RuntimeError: print "Failed Error"
+ except: print "Wrong Error Type 4"
try: raise RuntimeError,`t(t)`
except TypeError: pass
+ except RuntimeError: print "Failed Error"
+ except: print "Wrong Error Type 5"
+
try: raise RuntimeError,`t({})`
except TypeError: pass
+ except RuntimeError: print "Failed Error"
+ except: print "Wrong Error Type 6"
try:
try: raise RuntimeError,`t(10l**400)`
@@ -123,7 +138,7 @@ def runtest(t):
if __name__=='__main__':
#import libwadpy
- repeat,f2py_opts = f2py2e.f2py_testing.cmdline()
+ repeat,f2py_opts = f2py.f2py_testing.cmdline()
test_functions = build(f2py_opts)
- f2py2e.f2py_testing.run(runtest,test_functions,repeat)
+ f2py.f2py_testing.run(runtest,test_functions,repeat)
print 'ok'
View Lorry Controller Status