[Processing] Fix getParameterDescriptions

Add import json for script and r return descs and not None
qgis · May 31, 2016 · 7270fda · 7270fda
1 parent 52f3ca6
commit 7270fda
Show file tree

Hide file tree

Showing 2 changed files with 5 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 PyQt4.QtGui import QIcon
 
@@ -458,7 +459,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,8 @@
 
 import os
 from PyQt4 import QtGui
+import re
+import json
 from processing.core.GeoAlgorithm import GeoAlgorithm
 from processing.gui.Help2Html import getHtmlFromHelpFile
 from processing.core.parameters import ParameterRaster
@@ -358,5 +360,5 @@ def getParameterDescriptions(self):
                         if param.name in descriptions:
                             descs[param.name] = unicode(descriptions[param.name])
                 except:
-                    return None
+                    return descs
         return descs