[GRASS-SVN] r63042 - in grass/branches/releasebranch_7_0: . gui/wxpython/core lib/python/temporal

[svn_grass at osgeo.org]

Author: martinl
Date: 2014-11-26 05:40:21 -0800 (Wed, 26 Nov 2014)
New Revision: 63042

Modified:
   grass/branches/releasebranch_7_0/
   grass/branches/releasebranch_7_0/gui/wxpython/core/utils.py
   grass/branches/releasebranch_7_0/lib/python/temporal/stds_import.py
Log:
 g.mapset: gisdbase -> dbase


Property changes on: grass/branches/releasebranch_7_0
___________________________________________________________________
Modified: svn:mergeinfo
   - /grass/trunk:60817,61096,61141,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62856,62879,62881,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63035
   + /grass/trunk:60817,61096,61141,62105,62179-62180,62182,62403,62422,62424,62437,62466,62469,62487,62491,62494,62501,62506,62508-62509,62515,62518-62519,62521,62526,62533,62539,62541,62555,62562,62566,62570,62573,62575,62585,62588,62597,62603,62606,62608-62609,62614,62618,62628,62632,62638,62642,62648-62649,62652,62654-62657,62666,62691,62705,62709,62723,62730,62739,62741,62743,62746,62750,62752,62757,62762,62785,62798,62800-62801,62803,62805,62812,62822,62824,62831,62838,62847,62856,62879,62881,62907-62908,62910,62912,62914,62916,62918,62920,62925,62933,62935,62940,62942,62944-62946,62949,62958,62960,62962,62964,62966-62968,62970,62973,62975,62977,62981,62983,62985,62987,62989,62991,62993,62995,62997,62999-63000,63003,63005,63007,63009,63011,63013,63015,63017,63020,63022,63024,63026,63028-63031,63033,63035,63037,63040

Modified: grass/branches/releasebranch_7_0/gui/wxpython/core/utils.py
===================================================================
--- grass/branches/releasebranch_7_0/gui/wxpython/core/utils.py	2014-11-26 13:36:49 UTC (rev 63041)
+++ grass/branches/releasebranch_7_0/gui/wxpython/core/utils.py	2014-11-26 13:40:21 UTC (rev 63042)
@@ -653,7 +653,7 @@
                          read = True,
                          flags = 'l',
                          location = location,
-                         gisdbase = dbase)
+                         dbase = dbase)
         
         if not ret:
             return listOfMapsets

Modified: grass/branches/releasebranch_7_0/lib/python/temporal/stds_import.py
===================================================================
--- grass/branches/releasebranch_7_0/lib/python/temporal/stds_import.py	2014-11-26 13:36:49 UTC (rev 63041)
+++ grass/branches/releasebranch_7_0/lib/python/temporal/stds_import.py	2014-11-26 13:40:21 UTC (rev 63042)
@@ -273,7 +273,7 @@
         try:
             gscript.run_command("g.mapset", mapset="PERMANENT",
                                 location=location,
-                                gisdbase=old_env["GISDBASE"])
+                                dbase=old_env["GISDBASE"])
         except CalledModuleError:
             gscript.fatal(_("Unable to switch to location %s") % location)
         # create default database connection