[processing] fixed creating params and outputs from description strings

volaya · volaya · commit 25d0351d57cd · 2016-10-17T14:41:16.000+02:00
diff --git a/python/plugins/processing/core/outputs.py b/python/plugins/processing/core/outputs.py
@@ -396,7 +396,7 @@ def _resolveTemporary(self, alg):
 
 def getOutputFromString(s):
     try:
-        if "|" in s:
+        if "|" in s and s.startswith("Output"):
             tokens = s.split("|")
             params = [t if str(t) != "None" else None for t in tokens[1:]]
             clazz = getattr(sys.modules[__name__], tokens[0])
diff --git a/python/plugins/processing/core/parameters.py b/python/plugins/processing/core/parameters.py
@@ -1513,7 +1513,7 @@ def setValue(self, value):
 
 def getParameterFromString(s):
     # Try the parameter definitions used in description files
-    if '|' in s:
+    if '|' in s and (s.startswith("Parameter") or s.startswith("*Parameter")):
         isAdvanced = False
         if s.startswith("*"):
             s = s[1:]
@@ -1535,3 +1535,5 @@ def getParameterFromString(s):
                     return param
             except AttributeError:
                 pass
+            except:
+                return None
