Skip to content


Browse files Browse the repository at this point in the history
Merge pull request #2204 from Gustry/processing
[Processing] Small python changes
  • Loading branch information
volaya committed Jul 20, 2015
2 parents dc4049d + e751592 commit 49d0f3a
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion python/plugins/processing/core/
Expand Up @@ -31,7 +31,7 @@
from processing.core.ProcessingConfig import Setting, ProcessingConfig

class AlgorithmProvider:
class AlgorithmProvider(object):
"""This is the base class for algorithms providers.
An algorithm provider is a set of related algorithms, typically
Expand Down
6 changes: 3 additions & 3 deletions python/plugins/processing/core/
Expand Up @@ -142,7 +142,7 @@ def help(self):
return False, helpUrl

def processAlgorithm(self):
def processAlgorithm(self, progress):
"""Here goes the algorithm itself.
There is no return value from this method.
Expand Down Expand Up @@ -229,10 +229,10 @@ def execute(self, progress=None, model=None):
except GeoAlgorithmExecutionException, gaee:
except GeoAlgorithmExecutionException as gaee:
ProcessingLog.addToLog(ProcessingLog.LOG_ERROR, gaee.msg)
raise gaee
except Exception, e:
except Exception as e:
# If something goes wrong and is not caught in the
# algorithm, we catch it here and wrap it
lines = ['Uncaught error while executing algorithm')]
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/gui/
Expand Up @@ -50,7 +50,7 @@ def runalg(alg, progress=None):
return True
except GeoAlgorithmExecutionException, e:
except GeoAlgorithmExecutionException as e:
ProcessingLog.addToLog(sys.exc_info()[0], ProcessingLog.LOG_ERROR)
return False
Expand Down
2 changes: 1 addition & 1 deletion python/plugins/processing/gui/
Expand Up @@ -26,7 +26,7 @@
__revision__ = '$Format:%H$'

class SilentProgress:
class SilentProgress(object):

def error(self, msg):
print msg
Expand Down

0 comments on commit 49d0f3a

Please sign in to comment.