Skip to content

Commit 7270fda

Browse files
committed
[Processing] Fix getParameterDescriptions
Add import json for script and r return descs and not None
1 parent 52f3ca6 commit 7270fda

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

python/plugins/processing/algs/r/RAlgorithm.py

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

2828
import os
29+
import json
2930

3031
from PyQt4.QtGui import QIcon
3132

@@ -458,7 +459,7 @@ def getParameterDescriptions(self):
458459
if param.name in descriptions:
459460
descs[param.name] = unicode(descriptions[param.name])
460461
except:
461-
return None
462+
return descs
462463
return descs
463464

464465
def checkBeforeOpeningParametersDialog(self):

python/plugins/processing/script/ScriptAlgorithm.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727

2828
import os
2929
from PyQt4 import QtGui
30+
import re
31+
import json
3032
from processing.core.GeoAlgorithm import GeoAlgorithm
3133
from processing.gui.Help2Html import getHtmlFromHelpFile
3234
from processing.core.parameters import ParameterRaster
@@ -358,5 +360,5 @@ def getParameterDescriptions(self):
358360
if param.name in descriptions:
359361
descs[param.name] = unicode(descriptions[param.name])
360362
except:
361-
return None
363+
return descs
362364
return descs

0 commit comments

Comments
 (0)