From fded1a1f394a671c637a1f8e42e9d743f7dd3fea Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Mon, 5 Dec 2016 11:37:46 +1000 Subject: [PATCH] Don't explode returned values in QgsTaskWrapper Breaks returning list values --- python/core/__init__.py | 6 +----- tests/src/python/test_qgstaskmanager.py | 6 +++--- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/python/core/__init__.py b/python/core/__init__.py index f1bbca690d2..fa9590e5510 100644 --- a/python/core/__init__.py +++ b/python/core/__init__.py @@ -224,11 +224,7 @@ class QgsTaskWrapper(QgsTask): try: if self.returned_values: - # we want to support singular returned values which are not iterable - if hasattr(self.returned_values, '__iter__'): - self.on_finished(result, *self.returned_values) - else: - self.on_finished(result, self.returned_values) + self.on_finished(result, self.returned_values) else: self.on_finished(result) except Exception as ex: diff --git a/tests/src/python/test_qgstaskmanager.py b/tests/src/python/test_qgstaskmanager.py index 8ad1a5e478a..eb0d852d6e8 100644 --- a/tests/src/python/test_qgstaskmanager.py +++ b/tests/src/python/test_qgstaskmanager.py @@ -80,9 +80,9 @@ def run_multiple_val_result(task): return 5, 'whoo' -def finished_multiple_value_result(result, value, statement): - finished_multiple_value_result.value = value - finished_multiple_value_result.statement = statement +def finished_multiple_value_result(result, results): + finished_multiple_value_result.value = results[0] + finished_multiple_value_result.statement = results[1] return