wxGUI: move GetRealCmd from `utils` module to `gcmd`

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@50415 15284696-431f-4ddb-bdfa-cd5b030d7da7

gui/wxpython/core/gcmd.py

@@ -47,7 +47,16 @@ from grass.script import core as grass
 
 from core       import globalvar
 from core.debug import Debug
-from core.utils import GetRealCmd
+
+def GetRealCmd(cmd):
+    """!Return real command name - only for MS Windows
+    """
+    if sys.platform == 'win32':
+        for ext in globalvar.grassScripts.keys():
+            if cmd in globalvar.grassScripts[ext]:
+                return cmd + ext
+    
+    return cmd
 
 def DecodeString(string):
     """!Decode string using system encoding

gui/wxpython/core/utils.py

@@ -20,7 +20,7 @@ import glob
 import shlex
 import re
 
-from core.globalvar import ETCDIR, grassScripts
+from core.globalvar import ETCDIR
 sys.path.append(os.path.join(ETCDIR, "python"))
 
 from grass.script import core as grass
@@ -742,13 +742,3 @@ def GetSettingsPath():
         return os.path.join(os.getenv('APPDATA'), 'grass%d' % version)
     
     return os.path.join(os.getenv('HOME'), '.grass%d' % version)
-
-def GetRealCmd(cmd):
-    """!Return real command name - only for MS Windows
-    """
-    if sys.platform == 'win32':
-        for ext in grassScripts.keys():
-            if cmd in grassScripts[ext]:
-                return cmd + ext
-    
-    return cmd

gui/wxpython/gui_core/forms.py

@@ -2008,7 +2008,7 @@ class GUI:
         # parse the interface decription
         try:
             global _blackList
-            self.grass_task = gtask.parse_interface(utils.GetRealCmd(cmd[0]),
+            self.grass_task = gtask.parse_interface(gcmd.GetRealCmd(cmd[0]),
                                                     blackList = _blackList)
         except (grass.ScriptError, ValueError), e: 
             raise gcmd.GException(e.value)
@@ -2162,7 +2162,7 @@ if __name__ ==  "__main__":
     if sys.argv[1] !=  'test':
         q = wx.LogNull()
         cmd = utils.split(sys.argv[1])
-        task = gtask.grassTask(utils.GetRealCmd(cmd[0]))
+        task = gtask.grassTask(gcmd.GetRealCmd(cmd[0]))
         task.set_options(cmd[1:])
         app = GrassGUIApp(task)
         app.MainLoop()

gui/wxpython/gui_core/prompt.py

@@ -35,7 +35,7 @@ from grass.script import task as gtask
 from core          import globalvar
 from core          import utils
 from lmgr.menudata import ManagerData
-from core.gcmd     import EncodeString, DecodeString
+from core.gcmd     import EncodeString, DecodeString, GetRealCmd
 
 class PromptListCtrl(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin):
     """!PopUp window used by GPromptPopUp"""
@@ -801,7 +801,7 @@ class GPromptSTC(GPrompt, wx.stc.StyledTextCtrl):
                 self.OnCmdErase(None)
             else:
                 try:
-                    self.cmdDesc = gtask.parse_interface(utils.GetRealCmd(cmd))
+                    self.cmdDesc = gtask.parse_interface(GetRealCmd(cmd))
                 except IOError:
                     self.cmdDesc = None
         
@@ -1039,7 +1039,7 @@ class GPromptSTC(GPrompt, wx.stc.StyledTextCtrl):
             if cmd not in globalvar.grassCmd:
                 return
             
-            info = gtask.command_info(utils.GetRealCmd(cmd))
+            info = gtask.command_info(GetRealCmd(cmd))
             
             self.CallTipSetBackground("#f4f4d1")
             self.CallTipSetForeground("BLACK")
@@ -1117,7 +1117,7 @@ class GPromptSTC(GPrompt, wx.stc.StyledTextCtrl):
                         (not self.cmdDesc or cmd != self.cmdDesc.get_name()):
                     
                     try:
-                        self.cmdDesc = gtask.parse_interface(utils.GetRealCmd(cmd))
+                        self.cmdDesc = gtask.parse_interface(GetRealCmd(cmd))
                     except IOError:
                         self.cmdDesc = None
             event.Skip()