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

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-07-06 06:04:40 -0700 (Wed, 06 Jul 2011)
New Revision: 47023

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/location_wizard.py
   grass/branches/develbranch_6/lib/python/core.py
Log:
fix create_location() for wkt
    (merge r47022 from trunk)


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/location_wizard.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/location_wizard.py	2011-07-06 12:42:20 UTC (rev 47022)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/location_wizard.py	2011-07-06 13:04:40 UTC (rev 47023)
@@ -2034,7 +2034,7 @@
                 
                 grass.create_location(dbase = self.startpage.grassdatabase,
                                       location = self.startpage.location,
-                                      filename = self.wktpage.wktfile,
+                                      wkt = self.wktpage.wktfile,
                                       desc = self.startpage.locTitle)
         
         except grass.ScriptError, e:

Modified: grass/branches/develbranch_6/lib/python/core.py
===================================================================
--- grass/branches/develbranch_6/lib/python/core.py	2011-07-06 12:42:20 UTC (rev 47022)
+++ grass/branches/develbranch_6/lib/python/core.py	2011-07-06 13:04:40 UTC (rev 47023)
@@ -950,7 +950,7 @@
         ps = pipe_command('g.proj',
                           quiet = True,
                           flags = 'c',
-                          wkt = wktfile,
+                          wkt = wkt,
                           location = location,
                           stderr = PIPE)
     else: