[GRASS-SVN] r34950 - in grass/branches/develbranch_6: gui/wxpython/gui_modules lib/python

[svn_grass at osgeo.org]

Author: martinl
Date: 2008-12-19 18:06:25 -0500 (Fri, 19 Dec 2008)
New Revision: 34950

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/gdialogs.py
   grass/branches/develbranch_6/gui/wxpython/gui_modules/gselect.py
   grass/branches/develbranch_6/lib/python/grass.py
Log:
grass.py: list_grouped2() renamed to mlist_grouped()
	  (merge from trunk, r34949)


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/gdialogs.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/gdialogs.py	2008-12-19 23:03:51 UTC (rev 34949)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/gdialogs.py	2008-12-19 23:06:25 UTC (rev 34950)
@@ -690,7 +690,7 @@
         @param mapset mapset name
         """
         try:
-            self.map_layers = grass.list_grouped2(type=type, mapset=mapset)[mapset]
+            self.map_layers = grass.mlist_grouped(type=type, mapset=mapset)[mapset]
         except KeyError:
             self.map_layers = []
         

Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/gselect.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/gselect.py	2008-12-19 23:03:51 UTC (rev 34949)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/gselect.py	2008-12-19 23:06:25 UTC (rev 34950)
@@ -210,7 +210,7 @@
                 mapsets[i] = mapsets[0]
                 mapsets[0] = curr_mapset
 
-        filesdict = grass.list_grouped2(elementdict[element])
+        filesdict = grass.mlist_grouped(elementdict[element])
         
         for dir in mapsets:
             dir_node = self.AddItem('Mapset: '+dir)

Modified: grass/branches/develbranch_6/lib/python/grass.py
===================================================================
--- grass/branches/develbranch_6/lib/python/grass.py	2008-12-19 23:03:51 UTC (rev 34949)
+++ grass/branches/develbranch_6/lib/python/grass.py	2008-12-19 23:06:25 UTC (rev 34950)
@@ -296,7 +296,7 @@
             result[mapset].extend(line.split())
     return result
 
-def list_grouped2(type, mapset = None, pattern = None):
+def mlist_grouped(type, mapset = None, pattern = None):
     """Returns the output from running g.mlist, as a dictionary where the keys
     are mapset names and the values are lists of maps in that mapset. 
     """