Skip to content

Commit 6f3046c

Browse files
committedMar 27, 2014
[processing] fixed error when running script algorithm from script editor (fixes #9905)
1 parent e63b75c commit 6f3046c

File tree

2 files changed

+4
-8
lines changed

2 files changed

+4
-8
lines changed
 

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

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,18 +36,13 @@
3636
from qgis.core import *
3737

3838
from processing import interface
39-
4039
from processing.gui.ParametersDialog import ParametersDialog
4140
from processing.gui.HelpEditionDialog import HelpEditionDialog
42-
from processing.gui.ScriptEdit import ScriptEdit
43-
4441
from processing.modeler.Providers import Providers
45-
4642
from processing.r.RAlgorithm import RAlgorithm
4743
from processing.r.RUtils import RUtils
4844
from processing.script.ScriptAlgorithm import ScriptAlgorithm
4945
from processing.script.ScriptUtils import ScriptUtils
50-
5146
from processing.ui.ui_DlgScriptEditor import Ui_DlgScriptEditor
5247

5348
import processing.resources_rc

‎python/plugins/processing/script/ScriptAlgorithm.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
__revision__ = '$Format:%H$'
2727

2828
import os
29-
import sys
3029
from PyQt4 import QtGui
3130
from processing.core.GeoAlgorithm import GeoAlgorithm
3231
from processing.gui.Help2Html import Help2Html
@@ -218,7 +217,7 @@ def processParameterLine(self, line):
218217
self.addOutput(out)
219218
else:
220219
raise WrongScriptException('Could not load script:'
221-
+ self.descriptionFile
220+
+ self.descriptionFile or ''
222221
+ '.\n Problem with line "' + line + '"'
223222
)
224223

@@ -234,7 +233,7 @@ def processDescriptionParameterLine(self, line):
234233
self.addOutput(OutputFactory.getFromString(line))
235234
except Exception:
236235
raise WrongScriptException('Could not load script:'
237-
+ self.descriptionFile
236+
+ self.descriptionFile or ''
238237
+ '.\n Problem with line "' + line + '"'
239238
)
240239

@@ -257,6 +256,8 @@ def processAlgorithm(self, progress):
257256
out.setValue(ns[out.name])
258257

259258
def helpFile(self):
259+
if self.descriptionFile is None:
260+
return None
260261
helpfile = self.descriptionFile + '.help'
261262
if os.path.exists(helpfile):
262263
h2h = Help2Html()

0 commit comments

Comments
 (0)
Please sign in to comment.