[GRASS-SVN] r66063 - in grass/branches/releasebranch_7_0: gui/wxpython/core lib/python/script

[svn_grass at osgeo.org]

Author: annakrat
Date: 2015-08-29 15:53:14 -0700 (Sat, 29 Aug 2015)
New Revision: 66063

Modified:
   grass/branches/releasebranch_7_0/gui/wxpython/core/toolboxes.py
   grass/branches/releasebranch_7_0/lib/python/script/task.py
Log:
wxGUI: fix loading addons (with different locale) which are compiled for different version - use only byte strings (merged from trunk, r66036)

Modified: grass/branches/releasebranch_7_0/gui/wxpython/core/toolboxes.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/core/toolboxes.py	2015-08-29 22:01:27 UTC (rev 66062)
+++ grass/branches/releasebranch_7_0/gui/wxpython/core/toolboxes.py	2015-08-29 22:53:14 UTC (rev 66063)
@@ -627,7 +627,7 @@
     """
     try:
         task = gtask.parse_interface(module)
-    except (ScriptError, UnicodeDecodeError) as e:
+    except ScriptError as e:
         sys.stderr.write("%s: %s\n" % (module, e))
         return '', ''
 

Modified: grass/branches/releasebranch_7_0/lib/python/script/task.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/script/task.py	2015-08-29 22:01:27 UTC (rev 66062)
+++ grass/branches/releasebranch_7_0/lib/python/script/task.py	2015-08-29 22:53:14 UTC (rev 66063)
@@ -493,7 +493,7 @@
 
         if p.returncode != 0:
             raise ScriptError, _("Unable to fetch interface description for command '%(cmd)s'."
-                                 "\n\nDetails: %(det)s") % {'cmd': cmd, 'det': decode(cmderr)}
+                                 "\n\nDetails: %(det)s") % {'cmd': cmd, 'det': cmderr}
 
     except OSError as e:
         raise ScriptError, _("Unable to fetch interface description for command '%(cmd)s'."