Skip to content

Commit

Permalink
[Processing] Fix getParameterDescriptions
Browse files Browse the repository at this point in the history
Add import json for script and r
return descs and not None
  • Loading branch information
rldhont committed May 31, 2016
1 parent b79e5bb commit bb41cce
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
3 changes: 2 additions & 1 deletion python/plugins/processing/algs/r/RAlgorithm.py
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
__revision__ = '$Format:%H$'

import os
import json

from qgis.PyQt.QtGui import QIcon

Expand Down Expand Up @@ -461,7 +462,7 @@ def getParameterDescriptions(self):
if param.name in descriptions:
descs[param.name] = unicode(descriptions[param.name])
except:
return None
return descs
return descs

def checkBeforeOpeningParametersDialog(self):
Expand Down
3 changes: 2 additions & 1 deletion python/plugins/processing/script/ScriptAlgorithm.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

import os
import re
import json
from qgis.core import QgsExpressionContextUtils, QgsExpressionContext
from qgis.PyQt.QtGui import QIcon
from processing.core.GeoAlgorithm import GeoAlgorithm
Expand Down Expand Up @@ -378,5 +379,5 @@ def getParameterDescriptions(self):
if param.name in descriptions:
descs[param.name] = unicode(descriptions[param.name])
except:
return None
return descs
return descs

0 comments on commit bb41cce

Please sign in to comment.