Merge pull request #18803 from mantidproject/18802_convert_python_in_…

…group6 Convert Group6 from Python 2 to Python 3
mantidproject · Feb 14, 2017 · 651ed80 · 651ed80
2 parents 2653ac6 + ae719c3
commit 651ed80
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 1 deletion.
diff --git a/scripts/CompareFitMinimizers/fitting_benchmarking.py b/scripts/CompareFitMinimizers/fitting_benchmarking.py
@@ -137,7 +137,7 @@ def do_fitting_benchmark(nist_group_dir=None, cutest_group_dir=None, neutron_dat
     prob_results = [do_fitting_benchmark_group(block, minimizers, use_errors=use_errors) for
                     block in problem_blocks]
 
-    probs, results = zip(*prob_results)
+    probs, results = list(zip(*prob_results))
 
     if len(probs) != len(results):
         raise RuntimeError('probs : {0}, prob_results: {1}'.format(len(probs), len(results)))

diff --git a/scripts/CompareFitMinimizers/post_processing.py b/scripts/CompareFitMinimizers/post_processing.py
@@ -18,6 +18,7 @@
 # File change history is stored at: <https://github.com/mantidproject/mantid>.
 # Code Documentation is available at: <http://doxygen.mantidproject.org>
 
+from __future__ import (absolute_import, division, print_function)
 import numpy as np
 from scipy import stats  # older version of numpy does not support nanmean and nanmedian
 

diff --git a/scripts/CompareFitMinimizers/test_problem.py b/scripts/CompareFitMinimizers/test_problem.py
@@ -17,6 +17,7 @@
 #
 # File change history is stored at: <https://github.com/mantidproject/mantid>.
 # Code Documentation is available at: <http://doxygen.mantidproject.org>
+from __future__ import (absolute_import, division, print_function)
 
 
 class FittingTestProblem(object):

diff --git a/scripts/CompareFitMinimizers/test_result.py b/scripts/CompareFitMinimizers/test_result.py
@@ -17,6 +17,7 @@
 #
 # File change history is stored at: <https://github.com/mantidproject/mantid>.
 # Code Documentation is available at: <http://doxygen.mantidproject.org>
+from __future__ import (absolute_import, division, print_function)
 
 
 class FittingTestResult(object):