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

[nobody at svn.erp5.org]

Author: gabriel
Date: Fri Sep 24 17:16:18 2010
New Revision: 38628

URL: http://svn.erp5.org?rev=38628&view=rev
Log:
revert part of r38626 and remove attributes not used

Modified:
    erp5/trunk/utils/cloudooo/cloudooo/application/openoffice.py
    erp5/trunk/utils/cloudooo/cloudooo/handler/oohandler.py
    erp5/trunk/utils/cloudooo/cloudooo/helper/openoffice_tester.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=38628&r1=38627&r2=38628&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/application/openoffice.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/application/openoffice.py [utf8] Fri Sep 24 17:16:18 2010
@@ -31,6 +31,7 @@ from os import environ
 from os.path import exists, join
 from subprocess import Popen, PIPE
 from threading import Lock
+from sys import executable as python_path
 from zope.interface import implements
 from application import Application
 from xvfb import xvfb
@@ -57,7 +58,7 @@ 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"
+    command = [python_path
               , pkg_resources.resource_filename("cloudooo",
                                        join("helper", "openoffice_tester.py"))
               , "'--hostname=%s'" % host

Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/oohandler.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/oohandler.py?rev=38628&r1=38627&r2=38628&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/oohandler.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/oohandler.py [utf8] Fri Sep 24 17:16:18 2010
@@ -69,7 +69,7 @@ class OOHandler:
     hostname, port = openoffice.getAddress()
     kw['hostname'] = hostname
     kw['port'] = port
-    command_list = ["python"
+    command_list = [python_path
                     , pkg_resources.resource_filename("cloudooo",
                                         path.join("helper", "unoconverter.py"))
                     , "--uno_path='%s'" % self.uno_path
@@ -179,7 +179,6 @@ class OOHandler:
     base_document -- Boolean variable. if true, the document is also returned
     along with the metadata."""
     openoffice.acquire()
-    mimemapper_pickled = jsonpickle.encode(mimemapper)
     logger.debug("getMetadata")
     kw = dict(mimemapper=self._serializeMimemapper())
     if base_document:

Modified: erp5/trunk/utils/cloudooo/cloudooo/helper/openoffice_tester.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/helper/openoffice_tester.py?rev=38628&r1=38627&r2=38628&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/helper/openoffice_tester.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/helper/openoffice_tester.py [utf8] Fri Sep 24 17:16:18 2010
@@ -17,7 +17,7 @@ def main():
     opt_list, arg_list = getopt(sys.argv[1:], "", 
                                 ["port=","hostname=","uno_path="])
   except GetoptError, e:
-    usage(sys.stderr, "%s \nUse --port and --hostname" % e)
+    print >> sys.stderr, "%s \nUse --port and --hostname" % e
     sys.exit(2)
   
   for opt, arg in opt_list:

Modified: erp5/trunk/utils/cloudooo/cloudooo/mimemapper.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/mimemapper.py?rev=38628&r1=38627&r2=38628&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/mimemapper.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/mimemapper.py [utf8] Fri Sep 24 17:16:18 2010
@@ -34,6 +34,7 @@ from filter import Filter
 from os import environ, path
 from interfaces.mimemapper import IMimemapper
 from types import InstanceType
+from sys import executable as python_path
 
 class MimeMapper(object):
   """Load all filters from OOo. You can get the of the filter you want or all
@@ -106,7 +107,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"
+    command = [python_path
               , pkg_resources.resource_filename(__name__, 
                                         path.join("helper","unomimemapper.py"))
               , "'--uno_path=%s'" % uno_path