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

[nobody at svn.erp5.org]

Author: jm
Date: Thu Dec 23 20:17:06 2010
New Revision: 41734

URL: http://svn.erp5.org?rev=41734&view=rev
Log:
cloudooo: use environment python if OOo does not provide one

Modified:
    erp5/trunk/utils/cloudooo/cloudooo/application/openoffice.py
    erp5/trunk/utils/cloudooo/cloudooo/handler/oohandler.py
    erp5/trunk/utils/cloudooo/cloudooo/mimemapper.py
    erp5/trunk/utils/cloudooo/cloudooo/tests/testUnoConverter.py
    erp5/trunk/utils/cloudooo/cloudooo/tests/testUnoMimemapper.py

Modified: erp5/trunk/utils/cloudooo/cloudooo/application/openoffice.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/application/openoffice.py?rev=41734&r1=41733&r2=41734&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/application/openoffice.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/application/openoffice.py [utf8] Thu Dec 23 20:17:06 2010
@@ -59,7 +59,8 @@ class OpenOffice(Application):
     """Test if OpenOffice was started correctly"""
     logger.debug("Test OpenOffice %s - Pid %s" % (self.getAddress()[-1],
                                                   self.pid()))
-    args = [join(self.office_binary_path, "python"),
+    python = join(self.office_binary_path, "python")
+    args = [exists(python) and python or "python",
             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=41734&r1=41733&r2=41734&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/oohandler.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/oohandler.py [utf8] Thu Dec 23 20:17:06 2010
@@ -71,7 +71,8 @@ class OOHandler:
     hostname, port = openoffice.getAddress()
     kw['hostname'] = hostname
     kw['port'] = port
-    command_list = [path.join(self.office_binary_path, "python"),
+    python = path.join(self.office_binary_path, "python")
+    command_list = [path.exists(python) and python or "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=41734&r1=41733&r2=41734&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/mimemapper.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/mimemapper.py [utf8] Thu Dec 23 20:17:06 2010
@@ -108,7 +108,8 @@ 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"),
+    python = path.join(office_binary_path, "python")
+    command = [path.exists(python) and python or "python",
             pkg_resources.resource_filename(__name__,
                              path.join("helper", "unomimemapper.py")),
             "--uno_path=%s" % uno_path,

Modified: erp5/trunk/utils/cloudooo/cloudooo/tests/testUnoConverter.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/tests/testUnoConverter.py?rev=41734&r1=41733&r2=41734&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/tests/testUnoConverter.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/tests/testUnoConverter.py [utf8] Thu Dec 23 20:17:06 2010
@@ -60,7 +60,8 @@ class TestUnoConverter(cloudoooTestCase)
                                     'MS Word 97')],
                      doc_type_list_by_extension=dict(doc=['com.sun.star.text.TextDocument']))
     mimemapper_pickled = json.dumps(mimemapper)
-    command = [join(self.office_binary_path, "python"),
+    python = join(self.office_binary_path, "python")
+    command = [exists(python) and python or "python",
           pkg_resources.resource_filename("cloudooo", 
                                           "helper/unoconverter.py"),
           "'--convert'",

Modified: erp5/trunk/utils/cloudooo/cloudooo/tests/testUnoMimemapper.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/tests/testUnoMimemapper.py?rev=41734&r1=41733&r2=41734&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/tests/testUnoMimemapper.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/tests/testUnoMimemapper.py [utf8] Thu Dec 23 20:17:06 2010
@@ -52,7 +52,8 @@ class TestUnoMimeMapper(cloudoooTestCase
   def testCreateLocalAttributes(self):
     """Test if filters returns correctly the filters and types in dict"""
     hostname, host = openoffice.getAddress()
-    command = [path.join(self.office_binary_path, "python"),
+    python = path.join(self.office_binary_path, "python")
+    command = [path.exists(python) and python or "python",
             pkg_resources.resource_filename("cloudooo", "helper/unomimemapper.py"),
             "'--uno_path=%s'" % self.uno_path,
             "'--office_binary_path=%s'" % self.office_binary_path,
@@ -95,7 +96,8 @@ class TestUnoMimeMapper(cloudoooTestCase
     error_msg = "couldn\'t connect to socket (Success)\n"
     hostname, host = openoffice.getAddress()
     openoffice.stop()
-    command = [path.join(self.office_binary_path, "python"),
+    python = path.join(self.office_binary_path, "python")
+    command = [path.exists(python) and python or "python",
             pkg_resources.resource_filename("cloudooo", 
                                             "helper/unomimemapper.py"),
             "'--uno_path=%s'" % self.uno_path,