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

[Martin Landa]

Reminder for all Windows users, please note that winGRASS 7.1 no.>981
will be broken (calling python script from python script issue - eg.
wxGUI Extension manager) again.

2014-06-03 7:24 GMT+02:00  <svn_grass at osgeo.org>:
> 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
>
>
> _______________________________________________
> grass-commit mailing list
> grass-commit at lists.osgeo.org
> http://lists.osgeo.org/mailman/listinfo/grass-commit



-- 
Martin Landa * http://geo.fsv.cvut.cz/gwiki/Landa