wxGUI/query: convert everything to unicode to fix https://trac.osgeo.org/grass/ticket/2617

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@67328 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/wxpython/gui_core/query.py

@@ -17,6 +17,7 @@ import os
 import wx
 
 from core.utils import _
+from core.gcmd import DecodeString
 from gui_core.treeview import TreeListView
 from core.treemodel import TreeModel, DictNode
 
@@ -173,6 +174,7 @@ class QueryDialog(wx.Dialog):
 
 def QueryTreeBuilder(data, column):
     """Builds tree model from query results.
+    Convert to unicode.
 
     :param data: query results as a dictionary
     :param column: column name
@@ -181,12 +183,16 @@ def QueryTreeBuilder(data, column):
     """
     def addNode(parent, data, model):
         for k, v in data.iteritems():
+            if isinstance(v, str):
+                k = DecodeString(k)
             if isinstance(v, dict):
                 node = model.AppendNode(parent=parent, label=k)
                 addNode(parent=node, data=v, model=model)
             else:
                 if not isinstance(v, basestring):
                     v = str(v)
+                elif isinstance(v, str):
+                    v = DecodeString(v)
                 node = model.AppendNode(parent=parent, label=k,
                                         data={column: v})