From 5d98438544cb9c6af2b871911b1dc2a5abf0e2ea Mon Sep 17 00:00:00 2001 From: Sterling Harper Date: Sat, 30 Jan 2016 23:43:11 -0500 Subject: [PATCH] Fix Python3 string error --- openmc/statepoint.py | 6 ++++-- openmc/tally_derivative.py | 6 ++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/openmc/statepoint.py b/openmc/statepoint.py index ab37be78d5..ae86c26032 100644 --- a/openmc/statepoint.py +++ b/openmc/statepoint.py @@ -467,12 +467,14 @@ class StatePoint(object): for d_id in deriv_ids: base = 'tallies/derivatives/derivative {:d}'.format(d_id) deriv = openmc.TallyDerivative(derivative_id=d_id) - deriv.variable = self._f[base + '/dependent variable'].value + deriv.variable = \ + self._f[base + '/dependent variable'].value.decode() if deriv.variable == 'density': deriv.material = self._f[base + '/material'].value elif deriv.variable == 'nuclide_density': deriv.material = self._f[base + '/material'].value - deriv.nuclide = self._f[base + '/nuclide'].value.decode() + deriv.nuclide = \ + self._f[base + '/nuclide'].value.decode() else: raise RuntimeError('Unrecognized tally differential ' 'variable') diff --git a/openmc/tally_derivative.py b/openmc/tally_derivative.py index 932fd28a2f..9fbad187dc 100644 --- a/openmc/tally_derivative.py +++ b/openmc/tally_derivative.py @@ -1,10 +1,16 @@ from __future__ import division +import sys from numbers import Integral + from xml.etree import ElementTree as ET import openmc.checkvalue as cv + +if sys.version_info[0] >= 3: + basestring = str + # "Static" variable for auto-generated TallyDerivative IDs AUTO_TALLY_DERIV_ID = 10000