Przeglądaj źródła

wxGUI: use platform specific shlex.split() in command prompt

git-svn-id: https://svn.osgeo.org/grass/grass/trunk@44088 15284696-431f-4ddb-bdfa-cd5b030d7da7
Martin Landa 14 lat temu
rodzic
commit
c1e1fbee19

+ 1 - 1
gui/wxpython/gui_modules/prompt.py

@@ -613,7 +613,7 @@ class GPrompt(object):
         if cmdString[:2] == 'd.' and not self.parent.curr_page:
         if cmdString[:2] == 'd.' and not self.parent.curr_page:
             self.parent.NewDisplay(show=True)
             self.parent.NewDisplay(show=True)
         
         
-        cmd = shlex.split(str(cmdString))
+        cmd = utils.split(cmdString)
         if len(cmd) > 1:
         if len(cmd) > 1:
             self.parent.RunCmd(cmd, switchPage = True)
             self.parent.RunCmd(cmd, switchPage = True)
         else:
         else:

+ 5 - 0
gui/wxpython/gui_modules/utils.py

@@ -18,6 +18,7 @@ import platform
 import string
 import string
 import glob
 import glob
 import locale
 import locale
+import shlex
 
 
 import globalvar
 import globalvar
 sys.path.append(os.path.join(globalvar.ETCDIR, "python"))
 sys.path.append(os.path.join(globalvar.ETCDIR, "python"))
@@ -31,6 +32,10 @@ def normalize_whitespace(text):
     """!Remove redundant whitespace from a string"""
     """!Remove redundant whitespace from a string"""
     return string.join(string.split(text), ' ')
     return string.join(string.split(text), ' ')
 
 
+def split(s):
+    """!Platform spefic shlex.split"""
+    return shlex.split(s, posix = (sys.platform != "win32"))
+
 def GetTempfile(pref=None):
 def GetTempfile(pref=None):
     """
     """
     Creates GRASS temporary file using defined prefix.
     Creates GRASS temporary file using defined prefix.