sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-13 00:03:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't explode returned values in QgsTaskWrapper

Browse Source 
Breaks returning list values
This commit is contained in:
Nyall Dawson 2016-12-05 11:37:46 +10:00
parent f73f3c14f5
commit fded1a1f39
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
python/core/__init__.py
View File

@ -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:

6
tests/src/python/test_qgstaskmanager.py
View File

@ -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