Skip to content

Commit 49d0f3a

Browse files
committed
Merge pull request #2204 from Gustry/processing
[Processing] Small python changes
2 parents dc4049d + e751592 commit 49d0f3a

File tree

4 files changed

+6
-6
lines changed

4 files changed

+6
-6
lines changed

python/plugins/processing/core/AlgorithmProvider.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
from processing.core.ProcessingConfig import Setting, ProcessingConfig
3232

3333

34-
class AlgorithmProvider:
34+
class AlgorithmProvider(object):
3535
"""This is the base class for algorithms providers.
3636
3737
An algorithm provider is a set of related algorithms, typically

python/plugins/processing/core/GeoAlgorithm.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ def help(self):
142142
return False, helpUrl
143143

144144

145-
def processAlgorithm(self):
145+
def processAlgorithm(self, progress):
146146
"""Here goes the algorithm itself.
147147
148148
There is no return value from this method.
@@ -229,10 +229,10 @@ def execute(self, progress=None, model=None):
229229
progress.setPercentage(100)
230230
self.convertUnsupportedFormats(progress)
231231
self.runPostExecutionScript(progress)
232-
except GeoAlgorithmExecutionException, gaee:
232+
except GeoAlgorithmExecutionException as gaee:
233233
ProcessingLog.addToLog(ProcessingLog.LOG_ERROR, gaee.msg)
234234
raise gaee
235-
except Exception, e:
235+
except Exception as e:
236236
# If something goes wrong and is not caught in the
237237
# algorithm, we catch it here and wrap it
238238
lines = [self.tr('Uncaught error while executing algorithm')]

python/plugins/processing/gui/AlgorithmExecutor.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def runalg(alg, progress=None):
5050
try:
5151
alg.execute(progress)
5252
return True
53-
except GeoAlgorithmExecutionException, e:
53+
except GeoAlgorithmExecutionException as e:
5454
ProcessingLog.addToLog(sys.exc_info()[0], ProcessingLog.LOG_ERROR)
5555
progress.error(e.msg)
5656
return False

python/plugins/processing/gui/SilentProgress.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
__revision__ = '$Format:%H$'
2727

2828

29-
class SilentProgress:
29+
class SilentProgress(object):
3030

3131
def error(self, msg):
3232
print msg

0 commit comments

Comments
 (0)