[GRASS-SVN] r60679 - grass/trunk/lib/python/script

svn_grass at osgeo.org svn_grass at osgeo.org
Mon Jun 2 22:24:32 PDT 2014


Author: glynn
Date: 2014-06-02 22:24:32 -0700 (Mon, 02 Jun 2014)
New Revision: 60679

Modified:
   grass/trunk/lib/python/script/core.py
Log:
Remove Popen() "magic" on Windows; it creates more problems than it solves


Modified: grass/trunk/lib/python/script/core.py
===================================================================
--- grass/trunk/lib/python/script/core.py	2014-06-03 03:51:54 UTC (rev 60678)
+++ grass/trunk/lib/python/script/core.py	2014-06-03 05:24:32 UTC (rev 60679)
@@ -41,28 +41,8 @@
 
 
 class Popen(subprocess.Popen):
+    pass
 
-    def __init__(self, args, bufsize=0, executable=None,
-                 stdin=None, stdout=None, stderr=None,
-                 preexec_fn=None, close_fds=False, shell=None,
-                 cwd=None, env=None, universal_newlines=False,
-                 startupinfo=None, creationflags=0):
-
-        if shell == None:
-            shell = (sys.platform == "win32")
-        if sys.platform == "win32":
-            # get full path including file extension for scripts
-            fcmd = get_real_command(args[0]) 
-            if fcmd.endswith('.py'):
-                args[0] = fcmd
-                args.insert(0, sys.executable)
-        
-        subprocess.Popen.__init__(self, args, bufsize, executable,
-                                  stdin, stdout, stderr,
-                                  preexec_fn, close_fds, shell,
-                                  cwd, env, universal_newlines,
-                                  startupinfo, creationflags)
-
 PIPE = subprocess.PIPE
 STDOUT = subprocess.STDOUT
 



More information about the grass-commit mailing list