[Erp5-report] r41310 jm - in /erp5/trunk/utils/cloudooo/cloudooo: ./ application/

[nobody at svn.erp5.org]

Author: jm
Date: Fri Dec 10 10:52:38 2010
New Revision: 41310

URL: http://svn.erp5.org?rev=41310&view=rev
Log:
cloudooo: do not use 'Popen(shell=True, ...)'

Modified:
    erp5/trunk/utils/cloudooo/cloudooo/application/openoffice.py
    erp5/trunk/utils/cloudooo/cloudooo/mimemapper.py

Modified: erp5/trunk/utils/cloudooo/cloudooo/application/openoffice.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/application/openoffice.py?rev=41310&r1=41309&r2=41310&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/application/openoffice.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/application/openoffice.py [utf8] Fri Dec 10 10:52:38 2010
@@ -59,14 +59,14 @@ class OpenOffice(Application):
     """Test if OpenOffice was started correctly"""
     logger.debug("Test OpenOffice %s - Pid %s" % (self.getAddress()[-1],
                                                   self.pid()))
-    command = [join(self.office_binary_path, "python"),
-               pkg_resources.resource_filename("cloudooo",
+    args = [join(self.office_binary_path, "python"),
+            pkg_resources.resource_filename("cloudooo",
                                       join("helper", "openoffice_tester.py")),
-               "'--hostname=%s'" % host,
-               "'--port=%s'" % port,
-               "'--uno_path=%s'" % self.uno_path]
+            "--hostname=%s" % host,
+            "--port=%s" % port,
+            "--uno_path=%s" % self.uno_path]
     logger.debug("Testing Openoffice Instance %s" % port)
-    stdout, stderr = Popen(" ".join(command), shell=True, stdout=PIPE,
+    stdout, stderr = Popen(args, stdout=PIPE,
         stderr=PIPE, close_fds=True).communicate()
     stdout_bool = convertStringToBool(stdout.replace("\n", ""))
     if stdout_bool and stderr != "":

Modified: erp5/trunk/utils/cloudooo/cloudooo/mimemapper.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/mimemapper.py?rev=41310&r1=41309&r2=41310&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/mimemapper.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/mimemapper.py [utf8] Fri Dec 10 10:52:38 2010
@@ -107,18 +107,17 @@ class MimeMapper(object):
     uno_path = kw.get("uno_path", environ.get('uno_path'))
     office_binary_path = kw.get("office_binary_path",
                                 environ.get('office_binary_path'))
-    command = [path.join(office_binary_path, "python"),
-               pkg_resources.resource_filename(__name__,
+    args = [path.join(office_binary_path, "python"),
+            pkg_resources.resource_filename(__name__,
                              path.join("helper", "unomimemapper.py")),
-               "--uno_path='%s'" % uno_path,
-               "--office_binary_path='%s'" % office_binary_path,
-               "--hostname='%s'" % hostname,
-               "--port=%s" % port]
-    stdout, stderr = Popen(' '.join(command),
-                          stdout=PIPE,
-                          close_fds=True,
-                          shell=True,
-                          env=getCleanPythonEnvironment()).communicate()
+            "--uno_path=%s" % uno_path,
+            "--office_binary_path=%s" % office_binary_path,
+            "--hostname=%s" % hostname,
+            "--port=%s" % port]
+    stdout, stderr = Popen(args,
+                           stdout=PIPE,
+                           close_fds=True,
+                           env=getCleanPythonEnvironment()).communicate()
     exec(stdout)
     for key, value in filter_dict.iteritems():
       filter_name = key