[Erp5-report] r38626 gabriel - in /erp5/trunk/utils/cloudooo/cloudooo: ./ application/ hand...

[nobody at svn.erp5.org]

Author: gabriel
Date: Fri Sep 24 16:32:28 2010
New Revision: 38626

URL: http://svn.erp5.org?rev=38626&view=rev
Log:
use pkg_resources instead of import the package. Don't to use sys.executable in this cases, because if this is invokepython(), segmentation fault occurs with the subprocess

Modified:
    erp5/trunk/utils/cloudooo/cloudooo/application/openoffice.py
    erp5/trunk/utils/cloudooo/cloudooo/handler/oohandler.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=38626&r1=38625&r2=38626&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/application/openoffice.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/application/openoffice.py [utf8] Fri Sep 24 16:32:28 2010
@@ -26,17 +26,17 @@
 #
 ##############################################################################
 
+import pkg_resources
 from os import environ
 from os.path import exists, join
 from subprocess import Popen, PIPE
 from threading import Lock
 from zope.interface import implements
 from application import Application
-from sys import executable as python_path
 from xvfb import xvfb
 from cloudooo.interfaces.lockable import ILockable
 from cloudooo.utils import logger, waitStartDaemon, removeDirectory, \
-		waitStopDaemon, convertStringToBool
+                                    waitStopDaemon, convertStringToBool
 
 class OpenOffice(Application):
   """Object to control one OOo Instance and all features instance."""
@@ -57,9 +57,9 @@ class OpenOffice(Application):
   def _testOpenOffice(self, host, port):
     """Test if OpenOffice was started correctly"""
     logger.debug("Test OpenOffice %s - Pid %s" % (self.getAddress()[-1], self.pid()))
-    command = [python_path
-              , "'-c'"
-	      , "'from cloudooo.bin.openoffice_tester import main;main()'"
+    command = ["python"
+              , pkg_resources.resource_filename("cloudooo",
+                                       join("helper", "openoffice_tester.py"))
               , "'--hostname=%s'" % host
               , "'--port=%s'" % port
               , "'--uno_path=%s'" % self.uno_path]

Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/oohandler.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/oohandler.py?rev=38626&r1=38625&r2=38626&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/oohandler.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/oohandler.py [utf8] Fri Sep 24 16:32:28 2010
@@ -69,7 +69,7 @@ class OOHandler:
     hostname, port = openoffice.getAddress()
     kw['hostname'] = hostname
     kw['port'] = port
-    command_list = [python_path
+    command_list = ["python"
                     , pkg_resources.resource_filename("cloudooo",
                                         path.join("helper", "unoconverter.py"))
                     , "--uno_path='%s'" % self.uno_path

Modified: erp5/trunk/utils/cloudooo/cloudooo/mimemapper.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/mimemapper.py?rev=38626&r1=38625&r2=38626&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/mimemapper.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/mimemapper.py [utf8] Fri Sep 24 16:32:28 2010
@@ -32,7 +32,6 @@ from subprocess import Popen, PIPE
 from zope.interface import implements
 from filter import Filter
 from os import environ, path
-from sys import executable as python_path
 from interfaces.mimemapper import IMimemapper
 from types import InstanceType
 
@@ -107,7 +106,7 @@ 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 = [python_path
+    command = ["python"
               , pkg_resources.resource_filename(__name__, 
                                         path.join("helper","unomimemapper.py"))
               , "'--uno_path=%s'" % uno_path