[GRASS-SVN] r52156 - in grass/branches/releasebranch_6_4: gui/wxpython/gui_core lib/python

[svn_grass at osgeo.org]

Author: annakrat
Date: 2012-06-20 01:26:47 -0700 (Wed, 20 Jun 2012)
New Revision: 52156

Modified:
   grass/branches/releasebranch_6_4/gui/wxpython/gui_core/goutput.py
   grass/branches/releasebranch_6_4/lib/python/db.py
Log:
wxGUI: fix missing quotes (merge from trunk, r52154)

Modified: grass/branches/releasebranch_6_4/gui/wxpython/gui_core/goutput.py
===================================================================
--- grass/branches/releasebranch_6_4/gui/wxpython/gui_core/goutput.py	2012-06-20 08:26:39 UTC (rev 52155)
+++ grass/branches/releasebranch_6_4/gui/wxpython/gui_core/goutput.py	2012-06-20 08:26:47 UTC (rev 52156)
@@ -484,7 +484,7 @@
             fileHistory = codecs.open(filePath, encoding = 'utf-8', mode = 'a')
         except IOError, e:
             GError(_("Unable to write file '%(filePath)s'.\n\nDetails: %(error)s") % 
-                    {filePath: filePath, error : e },
+                    {'filePath': filePath, 'error' : e },
                    parent = self.parent)
             fileHistory = None
         
@@ -655,7 +655,7 @@
         dlg = wx.FileDialog(self, message = _("Save file as..."),
                             defaultFile = "grass_cmd_output.txt",
                             wildcard = _("%(txt)s (*.txt)|*.txt|%(files)s (*)|*") % 
-                            {txt: _("Text files"), files: _("Files")},
+                            {'txt': _("Text files"), 'files': _("Files")},
                             style = wx.SAVE | wx.FD_OVERWRITE_PROMPT)
         
         # Show the dialog and retrieve the user response. If it is the OK response,
@@ -667,7 +667,7 @@
                 output = open(path, "w")
                 output.write(text)
             except IOError, e:
-                GError(_("Unable to write file '%(path)s'.\n\nDetails: %(error)s") % {path: path, error: e})
+                GError(_("Unable to write file '%(path)s'.\n\nDetails: %(error)s") % {'path': path, 'error': e})
             finally:
                 output.close()
             self.parent.SetStatusText(_("Commands output saved into '%s'") % path)
@@ -781,7 +781,7 @@
                 output.write('\n')
         except IOError, e:
             GError(_("Unable to write file '%(filePath)s'.\n\nDetails: %(error)s") % 
-                    {filePath: self.cmdFileProtocol, error: e})
+                    {'filePath': self.cmdFileProtocol, 'error': e})
         finally:
             output.close()
             
@@ -801,7 +801,7 @@
             dlg = wx.FileDialog(self, message = _("Save file as..."),
                                 defaultFile = "grass_cmd_protocol.txt",
                                 wildcard = _("%(txt)s (*.txt)|*.txt|%(files)s (*)|*") % 
-                                            {txt: _("Text files"), files: _("Files")},
+                                            {'txt': _("Text files"), 'files': _("Files")},
                                 style = wx.SAVE | wx.FD_OVERWRITE_PROMPT)
             if dlg.ShowModal() == wx.ID_OK:
                 self.cmdFileProtocol = dlg.GetPath()

Modified: grass/branches/releasebranch_6_4/lib/python/db.py
===================================================================
--- grass/branches/releasebranch_6_4/lib/python/db.py	2012-06-20 08:26:39 UTC (rev 52155)
+++ grass/branches/releasebranch_6_4/lib/python/db.py	2012-06-20 08:26:47 UTC (rev 52156)
@@ -124,7 +124,7 @@
         args['table'] = table
     else:
         fatal(_("Programmer error: '%(sql)s', '%(filename)s', or '%(table)s' must be provided") %
-              {sql: 'sql', filename: 'filename', table: 'table'} )
+              {'sql': 'sql', 'filename': 'filename', 'table': 'table'} )
     
     if 'fs' not in args:
         args['fs'] = '|'