[GRASS-SVN] r64818 - grass/trunk/gui/wxpython/gui_core

[svn_grass at osgeo.org]

Author: annakrat
Date: 2015-03-08 13:47:28 -0700 (Sun, 08 Mar 2015)
New Revision: 64818

Modified:
   grass/trunk/gui/wxpython/gui_core/query.py
Log:
wxGUI/query: decode strings before creating tree, solves #2617

Modified: grass/trunk/gui/wxpython/gui_core/query.py
===================================================================
--- grass/trunk/gui/wxpython/gui_core/query.py	2015-03-08 19:59:57 UTC (rev 64817)
+++ grass/trunk/gui/wxpython/gui_core/query.py	2015-03-08 20:47:28 UTC (rev 64818)
@@ -17,6 +17,7 @@
 import wx
 
 from core.utils import _
+from core.gcmd import DecodeString
 from gui_core.treeview import TreeListView
 from core.treemodel import TreeModel, DictNode
 
@@ -181,12 +182,16 @@
     """
     def addNode(parent, data, model):
         for k, v in data.iteritems():
+            if type(k) == 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 type(v) == str:
+                    v = DecodeString(v)
                 node = model.AppendNode(parent=parent, label=k,
                                         data={column: v})