[GRASS-SVN] r57908 - grass/branches/releasebranch_6_4/gui/wxpython/lmgr

svn_grass at osgeo.org svn_grass at osgeo.org
Tue Oct 1 10:38:50 PDT 2013


Author: wenzeslaus
Date: 2013-10-01 10:38:50 -0700 (Tue, 01 Oct 2013)
New Revision: 57908

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/lmgr/frame.py
Log:
wxGUI: backport of r57865 (handling non-ascii characters returned by platform.platform function)

Modified: grass/branches/releasebranch_6_4/gui/wxpython/lmgr/frame.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/lmgr/frame.py	2013-10-01 15:03:15 UTC (rev 57907)
+++ grass/branches/releasebranch_6_4/gui/wxpython/lmgr/frame.py	2013-10-01 17:38:50 UTC (rev 57908)
@@ -763,6 +763,9 @@
             osgeo4w = ''
         
         self.goutput.WriteCmdLog(_("System Info"))
+        # platform from UTF-8 conversion was added because of Fedora 19
+        # which has the name Schrodinger's cat (umlaut and special ' character)
+        # which appears in the platform.platform() string
         self.goutput.WriteLog("%s: %s\n"
                               "%s: %s\n"
                               "%s: %s (%s)\n"
@@ -776,7 +779,7 @@
                                            gdalVersion, projVersion,
                                            platform.python_version(),
                                            wx.__version__,
-                                           _("Platform"), platform.platform(), osgeo4w),
+                                           _("Platform"), platform.platform().decode('utf8', errors='replace'), osgeo4w),
                               switchPage = True)
         self.goutput.WriteCmdLog(' ')
     



More information about the grass-commit mailing list