[Erp5-report] r37868 gabriel - in /erp5/trunk/utils/cloudooo/cloudooo: ./ bin/

[nobody at svn.erp5.org]

Author: gabriel
Date: Tue Aug 17 18:01:59 2010
New Revision: 37868

URL: http://svn.erp5.org?rev=37868&view=rev
Log:
clean code. remove unused Imports and refactor to use sys.executable instead of local_config

Modified:
    erp5/trunk/utils/cloudooo/cloudooo/bin/unoconverter.py
    erp5/trunk/utils/cloudooo/cloudooo/cloudooo.py
    erp5/trunk/utils/cloudooo/cloudooo/ooolib.py
    erp5/trunk/utils/cloudooo/cloudooo/utils.py

Modified: erp5/trunk/utils/cloudooo/cloudooo/bin/unoconverter.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/bin/unoconverter.py?rev=37868&r1=37867&r2=37868&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/bin/unoconverter.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/bin/unoconverter.py [utf8] Tue Aug 17 18:01:59 2010
@@ -200,7 +200,7 @@ def main():
       "hostname=", "port=", "source_format=",
       "document_url=", "destination_format=", 
       "mimemapper=", "metadata=",
-      "unomimemapper_bin=", "python_path="])
+      "unomimemapper_bin="])
   except GetoptError, msg:
     msg = msg.msg + help_msg
     usage(sys.stderr, msg)
@@ -233,8 +233,6 @@ def main():
       mimemapper = jsonpickle.decode(arg)
     elif opt == '--unomimemapper_bin':
       unomimemapper_bin = arg
-    elif opt == '--python_path':
-      python_path = arg
    
   kw = {}
   
@@ -249,18 +247,14 @@ def main():
     if "unomimemapper_bin" in locals():
       kw['unomimemapper_bin'] = unomimemapper_bin
 
-    if "python_path" in locals():
-      kw['python_path'] = python_path
-
+    kw['python_path'] = executable
     mimemapper.loadFilterList(hostname=hostname, port=port, **kw)
   
   kw.clear()
   if 'source_format' in locals():
     kw['source_format'] = source_format
-
+  
   unoconverter = UnoConverter(hostname, port, document_url, **kw)
-  if "--test" in param_list:
-    output = unoconverter.convert("pdf")
   if "--convert" in param_list and not '--getmetadata' in param_list \
       and 'destination_format' not in locals():
     output = unoconverter.convert()

Modified: erp5/trunk/utils/cloudooo/cloudooo/cloudooo.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/cloudooo.py?rev=37868&r1=37867&r2=37868&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/cloudooo.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/cloudooo.py [utf8] Tue Aug 17 18:01:59 2010
@@ -30,7 +30,7 @@ from signal import signal, SIGHUP
 from application.openoffice import openoffice
 from application.xvfb import xvfb
 from wsgixmlrpcapplication import WSGIXMLRPCApplication
-from utils import convertStringToBool, configureLogger, cleanDirectory
+from utils import convertStringToBool, configureLogger
 from os import path, mkdir
 from sys import executable
 from mimemapper import mimemapper
@@ -105,7 +105,7 @@ def application(global_config, **local_c
                           local_config.get('office_bin_path'), 
                           local_config.get('uno_path'),
                           unoconverter_bin=unoconverter_bin,
-                          python_path=local_config.get('python_path'),
+                          python_path=executable,
                           unomimemapper_bin=unomimemapper_bin,
                           openoffice_tester_bin=openoffice_tester_bin)
   openoffice.start()
@@ -120,11 +120,13 @@ def application(global_config, **local_c
   mimemapper.loadFilterList(application_hostname,
                             openoffice_port,
                             unomimemapper_bin=unomimemapper_bin,
-                            python_path=local_config.get('python_path'))
+                            python_path=executable)
   openoffice.release()
 
   from manager import Manager
   timeout_response = int(local_config.get('timeout_response'))
-  kw = dict(timeout=timeout_response, unoconverter_bin=unoconverter_bin)
+  kw = dict(timeout=timeout_response, 
+            unoconverter_bin=unoconverter_bin,
+            python_path=executable)
   cloudooo_manager = Manager(cloudooo_path_tmp_dir, **kw)
   return WSGIXMLRPCApplication(instance=cloudooo_manager)

Modified: erp5/trunk/utils/cloudooo/cloudooo/ooolib.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/ooolib.py?rev=37868&r1=37867&r2=37868&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/ooolib.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/ooolib.py [utf8] Tue Aug 17 18:01:59 2010
@@ -32,7 +32,7 @@ from os.path import exists
 
 def setUpUnoEnvironment(uno_path=None, office_bin_path=None):
   """Set up the environment to use the uno library and connect with the
-  openoffice by socket""" 
+  openoffice by socket"""
   if uno_path is not None:
     environ['uno_path'] = uno_path
   else:

Modified: erp5/trunk/utils/cloudooo/cloudooo/utils.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/utils.py?rev=37868&r1=37867&r2=37868&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/utils.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/utils.py [utf8] Tue Aug 17 18:01:59 2010
@@ -29,8 +29,7 @@
 from socket import socket, error
 from errno import EADDRINUSE
 from time import sleep
-from os.path import join, isdir, exists
-from os import listdir, remove
+from os import remove
 from shutil import rmtree
 import logging