From 4c5bdd443871b4a2a5a88abd4a1dddf1242cc10b Mon Sep 17 00:00:00 2001 From: Zhuoran Han Date: Wed, 16 May 2018 14:54:24 -0400 Subject: [PATCH 1/2] Checkvalue bug --- openmc/checkvalue.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openmc/checkvalue.py b/openmc/checkvalue.py index 3b334319f6..4a82983d96 100644 --- a/openmc/checkvalue.py +++ b/openmc/checkvalue.py @@ -265,7 +265,7 @@ def check_filetype_version(obj, expected_type, expected_version): if this_version[0] != expected_version: raise IOError('{} file has a version of {} which is not ' 'consistent with the version expected by OpenMC, {}' - .format(this_filetype, '.'.join(this_version), + .format(this_filetype, '.'.join(str(v) for v in this_version), expected_version)) except AttributeError: raise IOError('Could not read {} file. This most likely means the {} ' From 873523072dc6c89b13bc1d159bc9351f6df1c1d1 Mon Sep 17 00:00:00 2001 From: Zhuoran Han Date: Wed, 16 May 2018 15:43:10 -0400 Subject: [PATCH 2/2] Split the lines for code format. --- openmc/checkvalue.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openmc/checkvalue.py b/openmc/checkvalue.py index 4a82983d96..cbeac9c373 100644 --- a/openmc/checkvalue.py +++ b/openmc/checkvalue.py @@ -265,8 +265,9 @@ def check_filetype_version(obj, expected_type, expected_version): if this_version[0] != expected_version: raise IOError('{} file has a version of {} which is not ' 'consistent with the version expected by OpenMC, {}' - .format(this_filetype, '.'.join(str(v) for v in this_version), - expected_version)) + .format(this_filetype, + '.'.join(str(v) for v in this_version), + expected_version)) except AttributeError: raise IOError('Could not read {} file. This most likely means the {} ' 'file was produced by a different version of OpenMC than '