From fbc251e3524e129baee3de7aeed492561a68e114 Mon Sep 17 00:00:00 2001 From: Bill Ladwig Date: Thu, 25 Jan 2018 16:47:44 -0700 Subject: [PATCH] More python 3 fixes --- fortran/build_help/sub_sizes.py | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/fortran/build_help/sub_sizes.py b/fortran/build_help/sub_sizes.py index f9b7a1f..26feae1 100644 --- a/fortran/build_help/sub_sizes.py +++ b/fortran/build_help/sub_sizes.py @@ -12,17 +12,16 @@ def main(): split_result = result.split() - if (split_result[0].strip() != "SIZES" - and split_result[0].strip() != b"SIZES"): + if str(split_result[0].strip()) != "SIZES": raise ValueError("First line is not SIZES") - subs = {"FOMP_SCHED_KIND" : split_result[1].strip(), - "FOMP_LOCK_KIND" : split_result[2].strip(), - "FOMP_NEST_LOCK_KIND" : split_result[3].strip(), - "FOMP_SCHED_STATIC" : split_result[4].strip(), - "FOMP_SCHED_DYNAMIC" : split_result[5].strip(), - "FOMP_SCHED_GUIDED" : split_result[6].strip(), - "FOMP_SCHED_AUTO" : split_result[7].strip() + subs = {"FOMP_SCHED_KIND" : str(split_result[1].strip()), + "FOMP_LOCK_KIND" : str(split_result[2].strip()), + "FOMP_NEST_LOCK_KIND" : str(split_result[3].strip()), + "FOMP_SCHED_STATIC" : str(split_result[4].strip()), + "FOMP_SCHED_DYNAMIC" : str(split_result[5].strip()), + "FOMP_SCHED_GUIDED" : str(split_result[6].strip()), + "FOMP_SCHED_AUTO" : str(split_result[7].strip()) }