[Erp5-report] r41720 gabriel - in /erp5/trunk/utils/cloudooo/cloudooo: ./ helper/

[nobody at svn.erp5.org]

Author: gabriel
Date: Thu Dec 23 17:15:41 2010
New Revision: 41720

URL: http://svn.erp5.org?rev=41720&view=rev
Log:
refactor to send data via json

Modified:
    erp5/trunk/utils/cloudooo/cloudooo/helper/unomimemapper.py
    erp5/trunk/utils/cloudooo/cloudooo/mimemapper.py

Modified: erp5/trunk/utils/cloudooo/cloudooo/helper/unomimemapper.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/helper/unomimemapper.py?rev=41720&r1=41719&r2=41720&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/helper/unomimemapper.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/helper/unomimemapper.py [utf8] Thu Dec 23 17:15:41 2010
@@ -28,6 +28,7 @@
 ##############################################################################
 
 import sys
+import json
 import helper_utils
 from os import environ, path, putenv
 from getopt import getopt, GetoptError
@@ -127,7 +128,7 @@ def main():
   
   if not opt_list:
     help()
-  
+
   for opt, arg in opt_list:
     if opt in ("-h", "--help"):
       help()
@@ -143,7 +144,8 @@ def main():
   mimemapper = UnoMimemapper(hostname, port, **dict(environ))
   filter_dict = mimemapper.getFilterDict()
   type_dict = mimemapper.getTypeDict()
-  print "filter_dict = %s\ntype_dict = %s" % (filter_dict, type_dict)
+
+  print json.dumps((filter_dict, type_dict))
 
 if "__main__" == __name__:
   main()

Modified: erp5/trunk/utils/cloudooo/cloudooo/mimemapper.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/mimemapper.py?rev=41720&r1=41719&r2=41720&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/mimemapper.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/mimemapper.py [utf8] Thu Dec 23 17:15:41 2010
@@ -35,6 +35,7 @@ from os import environ, path
 from interfaces.mimemapper import IMimemapper
 from types import InstanceType
 from utils import getCleanPythonEnvironment
+import json
 
 
 class MimeMapper(object):
@@ -107,21 +108,21 @@ 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'))
-    args = [path.join(office_binary_path, "python"),
+    command = [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(args,
+    
+    stdout, stderr = Popen(command,
                            stdout=PIPE,
                            close_fds=True,
                            env=getCleanPythonEnvironment()).communicate()
-    # XXX Use json here
-    exec(stdout)
-    for key, value in filter_dict.iteritems():
-      filter_name = key
+    filter_dict, type_dict = json.loads(stdout)
+    
+    for filter_name, value in filter_dict.iteritems():
       flag = value.get("Flags")
       if flag in bad_flag_list:
         continue