Skip to content

Commit fded1a1

Browse files
committedDec 5, 2016
Don't explode returned values in QgsTaskWrapper
Breaks returning list values
1 parent f73f3c1 commit fded1a1

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed
 

‎python/core/__init__.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -224,11 +224,7 @@ def finished(self, result):
224224

225225
try:
226226
if self.returned_values:
227-
# we want to support singular returned values which are not iterable
228-
if hasattr(self.returned_values, '__iter__'):
229-
self.on_finished(result, *self.returned_values)
230-
else:
231-
self.on_finished(result, self.returned_values)
227+
self.on_finished(result, self.returned_values)
232228
else:
233229
self.on_finished(result)
234230
except Exception as ex:

‎tests/src/python/test_qgstaskmanager.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,9 @@ def run_multiple_val_result(task):
8080
return 5, 'whoo'
8181

8282

83-
def finished_multiple_value_result(result, value, statement):
84-
finished_multiple_value_result.value = value
85-
finished_multiple_value_result.statement = statement
83+
def finished_multiple_value_result(result, results):
84+
finished_multiple_value_result.value = results[0]
85+
finished_multiple_value_result.statement = results[1]
8686
return
8787

8888

0 commit comments

Comments
 (0)
Please sign in to comment.