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

[Cython] Fix conversion of element-related strings to Python strings

Browse source
This commit is contained in:
Ray Speth 2016-01-24 23:26:33 -05:00
parent c72f1b607a
commit efd6d232c7
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
interfaces/cython/cantera/thermo.pyx
View file

@ -1315,22 +1315,22 @@ class Element(object):
#: A list of the symbols of all the elements (not isotopes) defined
#: in Cantera
element_symbols = [getElementSymbol(<int>(m+1))
element_symbols = [pystr(getElementSymbol(<int>(m+1)))
for m in range(num_elements_defined)]
#: A list of the names of all the elements (not isotopes) defined
#: in Cantera
element_names = [getElementName(<int>m+1)
element_names = [pystr(getElementName(<int>m+1))
for m in range(num_elements_defined)]
def __init__(self, arg):
if isinstance(arg, (str, unicode, bytes)):
try:
# Assume the argument is the element symbol and try to get the name
self._name = getElementName(stringify(arg))
self._name = pystr(getElementName(stringify(arg)))
except RuntimeError:
# If getting the name failed, the argument must be the name
self._symbol = getElementSymbol(stringify(arg))
self._symbol = pystr(getElementSymbol(stringify(arg)))
self._name = arg.lower()
else:
self._symbol = arg
@ -1339,8 +1339,8 @@ class Element(object):
self._weight = getElementWeight(stringify(arg))
elif isinstance(arg, int):
self._atomic_number = arg
self._name = getElementName(<int>arg)
self._symbol = getElementSymbol(<int>arg)
self._name = pystr(getElementName(<int>arg))
self._symbol = pystr(getElementSymbol(<int>arg))
self._weight = getElementWeight(<int>arg)
else:
raise TypeError('The input argument to Element must be a string '