[GRASS-SVN] r49169 - grass/branches/develbranch_6/gui/wxpython/gui_modules

[svn_grass at osgeo.org]

Author: martinl
Date: 2011-11-10 06:49:07 -0800 (Thu, 10 Nov 2011)
New Revision: 49169

Modified:
   grass/branches/develbranch_6/gui/wxpython/gui_modules/gcmd.py
Log:
wxGUI: simplify gcmd.Popen constructor
       (merge r49168 from trunk)


Modified: grass/branches/develbranch_6/gui/wxpython/gui_modules/gcmd.py
===================================================================
--- grass/branches/develbranch_6/gui/wxpython/gui_modules/gcmd.py	2011-11-10 14:47:15 UTC (rev 49168)
+++ grass/branches/develbranch_6/gui/wxpython/gui_modules/gcmd.py	2011-11-10 14:49:07 UTC (rev 49169)
@@ -111,17 +111,11 @@
 
 class Popen(subprocess.Popen):
     """!Subclass subprocess.Popen"""
-    def __init__(self, *args, **kwargs):
+    def __init__(self, args, **kwargs):
         if subprocess.mswindows:
-            try:
-                kwargs['args'] = map(utils.EncodeString, kwargs['args'])
-            except KeyError:
-                if len(args) > 0:
-                    targs = list(args)
-                    targs[0] = map(utils.EncodeString, args[0])
-                    args = tuple(targs)
+            args = map(utils.EncodeString, args)
         
-        subprocess.Popen.__init__(self, *args, **kwargs)
+        subprocess.Popen.__init__(self, args, **kwargs)
         
     def recv(self, maxsize = None):
         return self._recv('stdout', maxsize)