[processing] Fixes #11345 - Python error while using Get script from …

…online scripts collection
qgis · Oct 7, 2014 · dcdf9fb · dcdf9fb
1 parent 17ca96f
commit dcdf9fb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/python/plugins/processing/gui/GetScriptsAndModels.py b/python/plugins/processing/gui/GetScriptsAndModels.py
@@ -159,9 +159,9 @@ def currentItemChanged(self, item, prev):
                 helpContent = readUrl(url)
                 descriptions = json.loads(helpContent)
                 html = '<h2>%s</h2>' % item.name
-                html += self.tr('<p><b>Description:</b>%s</p>') % getDescription(ALG_DESC, descriptions)
-                html += self.tr('<p><b>Created by:</b>%s') % getDescription(ALG_CREATOR, descriptions)
-                html += self.tr('<p><b>Version:</b>%s') % getDescription(ALG_VERSION, descriptions)
+                html += self.tr('<p><b>Description:</b> %s</p>') % getDescription(ALG_DESC, descriptions)
+                html += self.tr('<p><b>Created by:</b> %s') % getDescription(ALG_CREATOR, descriptions)
+                html += self.tr('<p><b>Version:</b> %s') % getDescription(ALG_VERSION, descriptions)
             except HTTPError, e:
                 html = self.tr('<h2>No detailed description available for this script</h2>')
             self.webView.setHtml(html)

diff --git a/python/plugins/processing/gui/Help2Html.py b/python/plugins/processing/gui/Help2Html.py
@@ -88,7 +88,7 @@ def getHtmlFromDescriptionsDict(alg, descriptions):
 
 def getDescription(name, descriptions):
     if name in descriptions:
-        return descriptions[name].replace("\n", "<br>")
+        return unicode(descriptions[name]).replace("\n", "<br>")
     else:
         return ''