[GRASS-SVN] r50572 - grass/branches/develbranch_6/gui/wxpython/gui_core

svn_grass at osgeo.org svn_grass at osgeo.org
Mon Jan 30 15:36:16 EST 2012


Author: martinl
Date: 2012-01-30 12:36:16 -0800 (Mon, 30 Jan 2012)
New Revision: 50572

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_core/goutput.py
Log:
wxGUI: change return type of RunCmd()


Modified: grass/branches/develbranch_6/gui/wxpython/gui_core/goutput.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_core/goutput.py	2012-01-30 20:33:36 UTC (rev 50571)
+++ grass/branches/develbranch_6/gui/wxpython/gui_core/goutput.py	2012-01-30 20:36:16 UTC (rev 50572)
@@ -503,7 +503,7 @@
                     GMessage(parent = self.parent,
                              message = _("Command '%s' not yet implemented in the WxGUI. "
                                          "Try adding it as a command layer instead.") % command[0])
-                    return None
+                    return
                 
                 if layertype == 'barscale':
                     self.parent.curr_page.maptree.GetMapDisplay().OnAddBarscale(None)
@@ -546,7 +546,7 @@
                                                    "Option <%(opt)s>: read from standard input is not "
                                                    "supported by wxGUI") % { 'cmd': ' '.join(command),
                                                                              'opt': p.get('name', '') })
-                                return 1
+                                return
                 else:
                     task = None
                 
@@ -557,7 +557,7 @@
                         GUI(parent = self).ParseCommand(command)
                     except GException, e:
                         print >> sys.stderr, e
-                    return 0
+                    return
                 
                 # switch to 'Command output' if required
                 if switchPage:
@@ -600,8 +600,6 @@
                                       onDone = onDone, onPrepare = onPrepare, userData = userData)
             self.cmdOutputTimer.Start(50)
         
-        return None
-
     def ClearHistory(self, event):
         """!Clear history of commands"""
         self.cmdOutput.SetReadOnly(False)



More information about the grass-commit mailing list