[GRASS-SVN] r49170 - grass/branches/develbranch_6/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-11-10 06:54:22 -0800 (Thu, 10 Nov 2011)
New Revision: 49170

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/utils.py
Log:
wxGUI: sync utils.ListOfMapsets() with trunk


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/utils.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/utils.py	2011-11-10 14:49:07 UTC (rev 49169)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/utils.py	2011-11-10 14:54:22 UTC (rev 49170)
@@ -247,10 +247,10 @@
                               read = True,
                               quiet = True,
                               flags = 'l',
-                              fs = ';')
+                              fs = 'newline')
         
         if ret:
-            mapsets = ret.replace('\n', '').strip().split(';')
+            mapsets = ret.splitlines()
             ListSortLower(mapsets)
         else:
             return None
@@ -260,12 +260,12 @@
                               read = True,
                               quiet = True,
                               flags = 'p',
-                              fs = ';')
+                              fs = 'newline')
         if ret:
             if get == 'accessible':
-                mapsets = ret.replace('\n', '').strip().split(';')
+                mapsets = ret.splitlines()
             else:
-                mapsets_accessible = ret.replace('\n', '').strip().split(';')
+                mapsets_accessible = ret.splitlines()
                 for mapset in mapsets_accessible:
                     mapsets.remove(mapset)
                 mapsets = mapsets_accessible + mapsets