From a675fbc99298fbe73f33d1f024cf88ebd9256e79 Mon Sep 17 00:00:00 2001
From: Ross Whitfield <whitfieldre@ornl.gov>
Date: Mon, 4 Mar 2019 11:26:37 -0500
Subject: [PATCH] Fix EnginX systemtest for python3
`unicode` doesn't exist in python 3, use six.u instead
---
scripts/Engineering/EnginX.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts/Engineering/EnginX.py b/scripts/Engineering/EnginX.py
index 4df7c7da246..64fa96b2ecf 100644
--- a/scripts/Engineering/EnginX.py
+++ b/scripts/Engineering/EnginX.py
@@ -11,6 +11,7 @@ import os
import csv
from platform import system
from shutil import copy2
+from six import u
def main(vanadium_run, user, focus_run, **kwargs):
@@ -523,7 +524,7 @@ def _save_out(run_number, focus_directory, focus_general, output, join_string, b
# work out where to save the files
filename = os.path.join(focus_directory, join_string.format(run_number, bank_id))
hdf5_name = os.path.join(focus_directory, run_number + ".hdf5")
- if not unicode(bank_id).isnumeric():
+ if not u(bank_id).isnumeric():
bank_id = 0
# save the files out to the user directory
simple.SaveFocusedXYE(InputWorkspace=output, Filename=filename + ".dat", SplitFiles=False,
--
GitLab