[Processing] Fix getParameterDescriptions

Add import json for script and r return descs and not None
qgis · May 31, 2016 · bb41cce · bb41cce
1 parent b79e5bb
commit bb41cce
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/python/plugins/processing/algs/r/RAlgorithm.py b/python/plugins/processing/algs/r/RAlgorithm.py
@@ -26,6 +26,7 @@
 __revision__ = '$Format:%H$'
 
 import os
+import json
 
 from qgis.PyQt.QtGui import QIcon
 
@@ -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):

diff --git a/python/plugins/processing/script/ScriptAlgorithm.py b/python/plugins/processing/script/ScriptAlgorithm.py
@@ -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
@@ -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