[GRASS-SVN] r48725 - grass/branches/develbranch_6/gui/wxpython

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-10-10 16:45:36 -0700 (Mon, 10 Oct 2011)
New Revision: 48725

Modified:
   grass/branches/develbranch_6/gui/wxpython/gis_set.py
Log:
wxGUI: there is no UnicodeString in `utils`
       (merge r48723 from trunk)


Modified: grass/branches/develbranch_6/gui/wxpython/gis_set.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gis_set.py	2011-10-10 23:43:44 UTC (rev 48724)
+++ grass/branches/develbranch_6/gui/wxpython/gis_set.py	2011-10-10 23:45:36 UTC (rev 48725)
@@ -224,9 +224,8 @@
                                               force = True)
                 self.lblocations.EnsureVisible(self.listOfLocations.index(location))
             except ValueError:
-                print >> sys.stderr, _("ERROR: Location <%s> not found") % \
-                    (utils.UnicodeString(location))
-                
+                print >> sys.stderr, _("ERROR: Location <%s> not found") % location
+            
             # list of mapsets
             self.UpdateMapsets(os.path.join(self.gisdbase, location))
             mapset = self.GetRCValue("MAPSET")
@@ -237,9 +236,8 @@
                     self.lbmapsets.EnsureVisible(self.listOfMapsets.index(mapset))
                 except ValueError:
                     self.lbmapsets.Clear()
-                    print >> sys.stderr, _("ERROR: Mapset <%s> not found") % \
-                        (utils.UnicodeString(mapset))
-            
+                    print >> sys.stderr, _("ERROR: Mapset <%s> not found") % mapset
+                    
     def _do_layout(self):
         label_style = wx.ADJUST_MINSIZE | wx.ALIGN_CENTER_HORIZONTAL
 
@@ -433,8 +431,8 @@
     def RenameMapset(self):
         """!Rename selected mapset
         """
-        location = utils.UnicodeString(self.listOfLocations[self.lblocations.GetSelection()])
-        mapset   = utils.UnicodeString(self.listOfMapsets[self.lbmapsets.GetSelection()])
+        location = self.listOfLocations[self.lblocations.GetSelection()]
+        mapset   = self.listOfMapsets[self.lbmapsets.GetSelection()]
         if mapset ==  'PERMANENT':
             GMessage(parent = self,
                      message = _('Mapset <PERMANENT> is required for valid GRASS location.\n\n'
@@ -474,7 +472,7 @@
     def RenameLocation(self):
         """!Rename selected location
         """
-        location = utils.UnicodeString(self.listOfLocations[self.lblocations.GetSelection()])
+        location = self.listOfLocations[self.lblocations.GetSelection()]
 
         dlg = wx.TextEntryDialog(parent = self,
                                  message = _('Current name: %s\n\nEnter new name:') % location,