Don't explode returned values in QgsTaskWrapper

Breaks returning list values
qgis · Dec 5, 2016 · fded1a1 · fded1a1
1 parent f73f3c1
commit fded1a1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/python/core/__init__.py b/python/core/__init__.py
@@ -224,11 +224,7 @@ def finished(self, result):
 
         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
@@ -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