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

[processing] Don't throw an exception if an expression cannot

Browse Source 
be prepared

There's cases where this happens without reflecting an invalid
expression. So we can try to prepare, but not abort if the
preparation fails.

Fixes #18103
This commit is contained in:
Nyall Dawson 2018-02-15 13:28:50 +10:00
parent e0b1d37cac
commit a8110369a8
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/plugins/processing/algs/qgis/FieldsCalculator.py
View File

@ -123,9 +123,7 @@ class FieldsCalculator(QgisAlgorithm):
if layer is not None: if layer is not None:
exp_context.appendScope(QgsExpressionContextUtils.layerScope(layer)) exp_context.appendScope(QgsExpressionContextUtils.layerScope(layer))
if not expression.prepare(exp_context): expression.prepare(exp_context)
raise QgsProcessingException(
self.tr('Evaluation error: {0}').format(expression.parserErrorString()))
features = source.getFeatures() features = source.getFeatures()
total = 100.0 / source.featureCount() if source.featureCount() else 0 total = 100.0 / source.featureCount() if source.featureCount() else 0

4
python/plugins/processing/algs/qgis/RandomPointsPolygons.py
View File

@ -116,9 +116,7 @@ class RandomPointsPolygons(QgisAlgorithm):
raise QgsProcessingException(expression.parserErrorString()) raise QgsProcessingException(expression.parserErrorString())
expressionContext = self.createExpressionContext(parameters, context, source) expressionContext = self.createExpressionContext(parameters, context, source)
if not expression.prepare(expressionContext): expression.prepare(expressionContext)
raise QgsProcessingException(
self.tr('Evaluation error: {0}').format(expression.evalErrorString()))
fields = QgsFields() fields = QgsFields()
fields.append(QgsField('id', QVariant.Int, '', 10, 0)) fields.append(QgsField('id', QVariant.Int, '', 10, 0))