Skip to content

Commit 685e4a2

Browse files
authored
Merge pull request #4041 from borysiasty/release-2_18
[Processing] Yet another fix for error message encoding errors. Fixes #16102
2 parents 1746b32 + 6071b40 commit 685e4a2

File tree

1 file changed

+6
-1
lines changed

1 file changed

+6
-1
lines changed

python/plugins/processing/core/GeoAlgorithm.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,13 @@ def execute(self, progress=SilentProgress(), model=None):
215215
lines = [self.tr('Uncaught error while executing algorithm')]
216216
lines.append(traceback.format_exc())
217217
ProcessingLog.addToLog(ProcessingLog.LOG_ERROR, lines)
218+
try:
219+
message = unicode(e)
220+
except UnicodeDecodeError:
221+
# Try with the 'replace' mode (requires e.message instead of e!)
222+
message = unicode(e.message, 'utf-8', 'replace')
218223
raise GeoAlgorithmExecutionException(
219-
unicode(e.message, errors='replace') + self.tr('\nSee log for more details'), lines, e)
224+
message + self.tr(' \nSee log for more details'), lines, e)
220225

221226
def _checkParameterValuesBeforeExecuting(self):
222227
for param in self.parameters:

0 commit comments

Comments
 (0)