Skip to content

Commit 5620854

Browse files
alexbruyalexbruy
committedJul 13, 2017
[processing] remove GeoAlgorithmExecutionException
·
ltr-3_40final-3_0_0
1 parent 97a5a3d commit 5620854

File tree

8 files changed

+23
-72
lines changed

8 files changed

+23
-72
lines changed
 

‎python/plugins/processing/core/GeoAlgorithm.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,12 @@
4040
QgsProcessingAlgorithm,
4141
QgsProject,
4242
QgsProcessingUtils,
43+
QgsProcessingException,
4344
QgsProcessingParameterDefinition,
4445
QgsMessageLog)
4546
from qgis.gui import QgsHelp
4647

4748
from processing.core.ProcessingConfig import ProcessingConfig
48-
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
4949
from processing.core.parameters import ParameterRaster, ParameterVector, ParameterMultipleInput, ParameterTable, Parameter
5050
from processing.core.outputs import OutputVector, OutputRaster, OutputTable, OutputHTML, Output
5151
from processing.algs.gdal.GdalUtils import GdalUtils
@@ -76,7 +76,7 @@ def processAlgorithm(self, parameters, context, feedback):
7676
"""Here goes the algorithm itself.
7777
7878
There is no return value from this method.
79-
A GeoAlgorithmExecutionException should be raised in case
79+
A QgsProcessingException should be raised in case
8080
something goes wrong.
8181
:param parameters:
8282
:param context:
@@ -105,7 +105,7 @@ def execute(self, parameters, context=None, feedback=None, model=None):
105105
it should be called using this method, since it performs
106106
some additional operations.
107107
108-
Raises a GeoAlgorithmExecutionException in case anything goes
108+
Raises a QgsProcessingException in case anything goes
109109
wrong.
110110
:param parameters:
111111
"""
@@ -124,18 +124,18 @@ def execute(self, parameters, context=None, feedback=None, model=None):
124124
feedback.setProgress(100)
125125
self.convertUnsupportedFormats(context, feedback)
126126
self.runPostExecutionScript(feedback)
127-
except GeoAlgorithmExecutionException as gaee:
127+
except QgsProcessingException as gaee:
128128
lines = [self.tr('Error while executing algorithm')]
129129
lines.append(traceback.format_exc())
130130
QgsMessageLog.logMessage(gaee.msg, self.tr('Processing'), QgsMessageLog.CRITICAL)
131-
raise GeoAlgorithmExecutionException(gaee.msg, lines, gaee)
131+
raise QgsProcessingException(gaee.msg, lines, gaee)
132132
except Exception as e:
133133
# If something goes wrong and is not caught in the
134134
# algorithm, we catch it here and wrap it
135135
lines = [self.tr('Uncaught error while executing algorithm')]
136136
lines.append(traceback.format_exc())
137137
QgsMessageLog.logMessage('\n'.join(lines), self.tr('Processing'), QgsMessageLog.CRITICAL)
138-
raise GeoAlgorithmExecutionException(str(e) + self.tr('\nSee log for more details'), lines, e)
138+
raise QgsProcessingException(str(e) + self.tr('\nSee log for more details'), lines, e)
139139

140140
def runPostExecutionScript(self, feedback):
141141
scriptFile = ProcessingConfig.getSetting(
@@ -235,7 +235,7 @@ def resolveOutputs(self):
235235
for out in self.outputs:
236236
out.resolveValue(self)
237237
except ValueError as e:
238-
raise GeoAlgorithmExecutionException(str(e))
238+
raise QgsProcessingException(str(e))
239239

240240
def setOutputCRS(self):
241241
context = dataobjects.createContext()
@@ -319,7 +319,7 @@ def executeAlgorithm(alg, parameters, context=None, feedback=None, model=None):
319319
it should be called using this method, since it performs
320320
some additional operations.
321321
322-
Raises a GeoAlgorithmExecutionException in case anything goes
322+
Raises a QgsProcessingException in case anything goes
323323
wrong.
324324
:param parameters:
325325
"""

‎python/plugins/processing/core/GeoAlgorithmExecutionException.py

Lines changed: 0 additions & 48 deletions
This file was deleted.

‎python/plugins/processing/core/Processing.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
QgsMapLayer,
4242
QgsProcessingProvider,
4343
QgsProcessingAlgorithm,
44+
QgsProcessingException,
4445
QgsProcessingParameterDefinition,
4546
QgsProcessingOutputVectorLayer,
4647
QgsProcessingOutputRasterLayer)
@@ -54,7 +55,6 @@
5455
from processing.gui.Postprocessing import handleAlgorithmResults
5556
from processing.gui.AlgorithmExecutor import execute
5657
from processing.tools import dataobjects
57-
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
5858

5959
from processing.algs.qgis.QGISAlgorithmProvider import QGISAlgorithmProvider # NOQA
6060
#from processing.algs.grass7.Grass7AlgorithmProvider import Grass7AlgorithmProvider # NOQA
@@ -140,7 +140,7 @@ def runAlgorithm(algOrName, parameters, onFinish=None, feedback=None, context=No
140140
print('Error: Algorithm not found\n')
141141
msg = Processing.tr('Error: Algorithm {0} not found\n').format(algOrName)
142142
feedback.reportError(msg)
143-
raise GeoAlgorithmExecutionException(msg)
143+
raise QgsProcessingException(msg)
144144

145145
# check for any mandatory parameters which were not specified
146146
for param in alg.parameterDefinitions():
@@ -150,7 +150,7 @@ def runAlgorithm(algOrName, parameters, onFinish=None, feedback=None, context=No
150150
msg = Processing.tr('Error: Missing parameter value for parameter {0}.').format(param.name())
151151
print('Error: Missing parameter value for parameter %s.' % param.name())
152152
feedback.reportError(msg)
153-
raise GeoAlgorithmExecutionException(msg)
153+
raise QgsProcessingException(msg)
154154

155155
if context is None:
156156
context = dataobjects.createContext(feedback)
@@ -161,7 +161,7 @@ def runAlgorithm(algOrName, parameters, onFinish=None, feedback=None, context=No
161161
print('Unable to execute algorithm\n' + str(msg))
162162
msg = Processing.tr('Unable to execute algorithm\n{0}').format(msg)
163163
feedback.reportError(msg)
164-
raise GeoAlgorithmExecutionException(msg)
164+
raise QgsProcessingException(msg)
165165

166166
if not alg.validateInputCrs(parameters, context):
167167
print('Warning: Not all input layers use the same CRS.\n' +
@@ -188,7 +188,7 @@ def runAlgorithm(algOrName, parameters, onFinish=None, feedback=None, context=No
188188
else:
189189
msg = Processing.tr("There were errors executing the algorithm.")
190190
feedback.reportError(msg)
191-
raise GeoAlgorithmExecutionException(msg)
191+
raise QgsProcessingException(msg)
192192

193193
if isinstance(feedback, MessageBarProgress):
194194
feedback.close()

‎python/plugins/processing/gui/AlgorithmExecutor.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
QgsProcessingUtils,
3838
QgsMessageLog,
3939
QgsProperty,
40+
QgsProcessingException,
4041
QgsProcessingParameters,
4142
QgsProcessingOutputLayerDefinition)
42-
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
4343
from processing.gui.Postprocessing import handleAlgorithmResults
4444
from processing.tools import dataobjects
4545
from processing.tools.system import getTempFilename
@@ -61,7 +61,7 @@ def execute(alg, parameters, context=None, feedback=None):
6161
try:
6262
results, ok = alg.run(parameters, context, feedback)
6363
return ok, results
64-
except GeoAlgorithmExecutionException as e:
64+
except QgsProcessingException as e:
6565
QgsMessageLog.logMessage(str(sys.exc_info()[0]), 'Processing', QgsMessageLog.CRITICAL)
6666
if feedback is not None:
6767
feedback.reportError(e.msg)

‎python/plugins/processing/tests/AlgorithmsTestBase.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@
5151
from processing.modeler.ModelerAlgorithmProvider import ModelerAlgorithmProvider # NOQA
5252
from processing.algs.qgis.QGISAlgorithmProvider import QGISAlgorithmProvider # NOQA
5353
#from processing.algs.grass7.Grass7AlgorithmProvider import Grass7AlgorithmProvider # NOQA
54-
from processing.algs.gdal.GdalAlgorithmProvider import GdalAlgorithmProvider # NOQA
55-
from processing.algs.saga.SagaAlgorithmProvider import SagaAlgorithmProvider # NOQA
54+
#from processing.algs.gdal.GdalAlgorithmProvider import GdalAlgorithmProvider # NOQA
55+
#from processing.algs.saga.SagaAlgorithmProvider import SagaAlgorithmProvider # NOQA
5656
from processing.script.ScriptAlgorithmProvider import ScriptAlgorithmProvider # NOQA
57-
from processing.preconfigured.PreconfiguredAlgorithmProvider import PreconfiguredAlgorithmProvider # NOQA
57+
#from processing.preconfigured.PreconfiguredAlgorithmProvider import PreconfiguredAlgorithmProvider # NOQA
5858

5959

6060
from qgis.core import (QgsVectorLayer,

‎python/plugins/processing/tests/QgisAlgorithmsTest.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@
3131
import shutil
3232

3333
from qgis.core import (QgsProcessingAlgorithm,
34-
QgsProcessingFeedback)
34+
QgsProcessingFeedback,
35+
QgsProcessingException)
3536
from qgis.testing import start_app, unittest
36-
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
3737
from processing.tools.dataobjects import createContext
3838

3939

@@ -55,7 +55,7 @@ def createInstance(self):
5555
return TestAlg()
5656

5757
def processAlgorithm(self, parameters, context, feedback):
58-
raise GeoAlgorithmExecutionException('Exception while processing')
58+
raise QgsProcessingException('Exception while processing')
5959
return {}
6060

6161

‎python/plugins/processing/tools/dataobjects.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
from processing.algs.gdal.GdalUtils import GdalUtils
5353
from processing.tools.system import (getTempFilename,
5454
removeInvalidChars)
55-
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
5655

5756
ALL_TYPES = [-1]
5857

‎python/plugins/processing/tools/raster.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import numpy
3636
from osgeo import gdal
3737

38-
from processing.core.GeoAlgorithmExecutionException import GeoAlgorithmExecutionException
38+
from qgis.core import QgsProcessingException
3939

4040

4141
RASTER_EXTENSION_MAP = None
@@ -96,7 +96,7 @@ def scanraster(layer, feedback):
9696
elif bandtype == 'Float64':
9797
values = struct.unpack('d' * band.XSize, scanline)
9898
else:
99-
raise GeoAlgorithmExecutionException('Raster format not supported')
99+
raise QgsProcessingException('Raster format not supported')
100100
for value in values:
101101
if value == nodata:
102102
value = None

0 commit comments

Comments
 (0)
Please sign in to comment.