From 2dafee528bfb75917ac1d0a58556d2cb76f7ac4a Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Tue, 5 May 2020 23:43:36 +0200 Subject: [PATCH] Fix some remaining issues --- python/plugins/processing/tests/OtbAlgorithmsTest.py | 2 +- scripts/parse_dash_results.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/python/plugins/processing/tests/OtbAlgorithmsTest.py b/python/plugins/processing/tests/OtbAlgorithmsTest.py index c42a607434c..1d8a301714b 100644 --- a/python/plugins/processing/tests/OtbAlgorithmsTest.py +++ b/python/plugins/processing/tests/OtbAlgorithmsTest.py @@ -43,7 +43,7 @@ from qgis.testing import start_app, unittest from processing.core.ProcessingConfig import ProcessingConfig, Setting from processing.gui.AlgorithmDialog import AlgorithmDialog from processing.gui.BatchAlgorithmDialog import BatchAlgorithmDialog -from processing.gui.wrappers import WidgetWrapperFactory, +from processing.gui.wrappers import WidgetWrapperFactory from processing.modeler.ModelerParametersDialog import ModelerParametersDialog from processing.algs.otb.OtbAlgorithm import OtbAlgorithm from processing.algs.otb.OtbAlgorithmProvider import OtbAlgorithmProvider diff --git a/scripts/parse_dash_results.py b/scripts/parse_dash_results.py index 6f58835a8c0..351bae4568d 100755 --- a/scripts/parse_dash_results.py +++ b/scripts/parse_dash_results.py @@ -158,7 +158,7 @@ class ResultHandler(QDialog): images = {} for img in measurement_img: - m = re.search('Rendered Image (.*?)(\s|$)', img['role']) + m = re.search(r'Rendered Image (.*?)(\s|$)', img['role']) test_name = m.group(1) rendered_image = 'displayImage.php?imgid={}'.format(img['imgid']) images[test_name] = '{}/{}'.format(dash_url, rendered_image) @@ -286,7 +286,7 @@ class ResultHandler(QDialog): def get_control_image_path(self, test_name): if os.path.isfile(test_name): - return path + return test_name # else try and find matching test image script_folder = os.path.dirname(os.path.realpath(sys.argv[0]))