research/cantera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[Test] Fix deprecation warnings in Python tests

Browse source 
This also fixes support for Numpy 1.10, which removes the 'skiprows' keyword.
This commit is contained in:
Ray Speth 2015-10-07 12:48:29 -04:00
parent 035c6d4ca1
commit 051b9d1f51
2 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
interfaces/cython/cantera/ck2cti.py
View file

@ -70,16 +70,17 @@ if sys.version_info[0] == 2:
def strip_nonascii(s):
return s.decode('ascii', 'ignore')
def open(filename, *args):
return _open(filename, *args)
def open(filename, mode, *args):
return _open(filename, mode, *args)
else:
string_types = (str,)
def strip_nonascii(s):
return s.encode('ascii', 'ignore').decode()
def open(filename, *args):
return _open(filename, *args, errors='ignore')
def open(filename, mode, *args):
mode = mode.replace('U', '')
return _open(filename, mode, *args, errors='ignore')
def compatible_quantities(quantity_basis, units):

2
interfaces/cython/cantera/test/test_onedim.py
View file

@ -360,7 +360,7 @@ class TestFreeFlame(utilities.CanteraTest):
self.create_sim(2e5, 350, 'H2:1.0, O2:2.0', mech='h2o2.xml')
self.sim.write_csv(filename)
data = np.genfromtxt(filename, delimiter=',', skiprows=1)
data = np.genfromtxt(filename, delimiter=',', skip_header=1)
self.assertArrayNear(data[:,0], self.sim.grid)
self.assertArrayNear(data[:,3], self.sim.T)
k = self.gas.species_index('H2')