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

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-10-12 05:01:49 -0700 (Wed, 12 Oct 2011)
New Revision: 48758

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/gselect.py
   grass/branches/develbranch_6/lib/python/core.py
Log:
pythonlib: r48755 - follow naming convetion
	   (merge r48757 from trunk)


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/gselect.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/gselect.py	2011-10-12 11:59:40 UTC (rev 48757)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/gselect.py	2011-10-12 12:01:49 UTC (rev 48758)
@@ -327,7 +327,7 @@
         
         # list of mapsets in current location
         if mapsets is None:
-            mapsets = grass.mapsets(searchPath = True)
+            mapsets = grass.mapsets(search_path = True)
         
         # current mapset first
         if curr_mapset in mapsets and mapsets[0] != curr_mapset:

Modified: grass/branches/develbranch_6/lib/python/core.py
===================================================================
--- grass/branches/develbranch_6/lib/python/core.py	2011-10-12 11:59:40 UTC (rev 48757)
+++ grass/branches/develbranch_6/lib/python/core.py	2011-10-12 12:01:49 UTC (rev 48758)
@@ -620,7 +620,7 @@
     mapset_re = re.compile("<(.*)>")
     result = {}
     if check_search_path:
-        for mapset in mapsets(searchPath = True):
+        for mapset in mapsets(search_path = True):
             result[mapset] = []
     
     mapset = None
@@ -703,7 +703,7 @@
     """
     result = {}
     if check_search_path:
-        for mapset in mapsets(searchPath = True):
+        for mapset in mapsets(search_path = True):
             result[mapset] = []
     
     mapset = None
@@ -866,14 +866,14 @@
 
 # interface to g.mapsets
 
-def mapsets(searchPath = False):
+def mapsets(search_path = False):
     """!List available mapsets
 
     @param searchPatch True to list mapsets only in search path
     
     @return list of mapsets
     """
-    if searchPath:
+    if search_path:
         flags = 'p'
     else:
         flags = 'l'