Merge pull request #3826 from alexbruy/processing-models

fix loading of models containing user-defined scripts
qgis · Dec 2, 2016 · 586166c6c40e0ec3bc213d294e3e9d72eac799bc · 586166c
2 parents b3742fe + 8dc7799
commit 586166c6c40e0ec3bc213d294e3e9d72eac799bc
Unified Split

Showing with 4 additions and 1 deletion.

+4 −1 python/plugins/processing/modeler/ModelerAlgorithm.py
diff --git a/python/plugins/processing/modeler/ModelerAlgorithm.py b/python/plugins/processing/modeler/ModelerAlgorithm.py
@@ -566,7 +566,10 @@ def fromJson(s):
         def fromdict(d):
             try:
                 fullClassName = d["class"]
-                tokens = fullClassName.split(".")
+                if isinstance(fullClassName, basestring):
+                    tokens = fullClassName.split(".")
+                else:
+                    tokens = fullClassName.__class__.__name__.split(".")
                 className = tokens[-1]
                 moduleName = ".".join(tokens[:-1])
                 values = d["values"]