[GRASS-SVN] r70979 - grass/trunk/gui/wxpython/core

[svn_grass at osgeo.org]

Author: annakrat
Date: 2017-04-28 06:21:09 -0700 (Fri, 28 Apr 2017)
New Revision: 70979

Modified:
   grass/trunk/gui/wxpython/core/render.py
   grass/trunk/gui/wxpython/core/workspace.py
Log:
wxGUI: fix encoding, see #3340

Modified: grass/trunk/gui/wxpython/core/render.py
===================================================================
--- grass/trunk/gui/wxpython/core/render.py	2017-04-28 12:59:50 UTC (rev 70978)
+++ grass/trunk/gui/wxpython/core/render.py	2017-04-28 13:21:09 UTC (rev 70979)
@@ -1273,8 +1273,8 @@
         renderMgr = layer.GetRenderMgr()
         Debug.msg(
             1, "Map.AddLayer(): ltype={0}, command={1}".format(
-                ltype, layer.GetCmd(
-                    string=True)))
+                ltype, EncodeString(layer.GetCmd(
+                    string=True))))
         if renderMgr:
             if layer.type == 'wms':
                 renderMgr.dataFetched.connect(self.renderMgr.ReportProgress)

Modified: grass/trunk/gui/wxpython/core/workspace.py
===================================================================
--- grass/trunk/gui/wxpython/core/workspace.py	2017-04-28 12:59:50 UTC (rev 70978)
+++ grass/trunk/gui/wxpython/core/workspace.py	2017-04-28 13:21:09 UTC (rev 70979)
@@ -990,7 +990,7 @@
                         self.indent += 4
                         self.file.write(
                             '%s<value>%s</value>\n' %
-                            (' ' * self.indent, self.__filterValue(val)))
+                            (' ' * self.indent, EncodeString(self.__filterValue(val))))
                         self.indent -= 4
                         self.file.write(
                             '%s</parameter>\n' %