[Erp5-report] r42080 kazuhiko - in /erp5/trunk/utils/cloudooo/cloudooo: ./ handler/ooo/ han...

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Thu Jan  6 17:30:47 2011
New Revision: 42080

URL: http://svn.erp5.org?rev=42080&view=rev
Log:
existing environment variables should not affect cloudooo. if some enviroment variables should be set, we should improve cloudooo so that it can accepts such parameters in its configuration file.

Modified:
    erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/application/openoffice.py
    erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/mimemapper.py
    erp5/trunk/utils/cloudooo/cloudooo/utils.py
    erp5/trunk/utils/cloudooo/cloudooo/utils/utils.py

Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/application/openoffice.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/application/openoffice.py?rev=42080&r1=42079&r2=42080&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/application/openoffice.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/application/openoffice.py [utf8] Thu Jan  6 17:30:47 2011
@@ -40,7 +40,6 @@ from cloudooo.utils.utils import logger,
 from cloudooo.handler.ooo.utils.utils import waitStartDaemon, \
                                       removeDirectory, waitStopDaemon, \
                                       socketStatus
-from cloudooo.utils.utils import getCleanPythonEnvironment
 
 class OpenOffice(Application):
   """Object to control one OOo Instance and all features instance."""
@@ -145,7 +144,7 @@ class OpenOffice(Application):
          ]
     # To run the instance OOo is need a environment. So, the "DISPLAY" of Xvfb
     # is passed to env and the environment customized is passed to the process
-    env = getCleanPythonEnvironment()
+    env = {}
     env["HOME"] = self.path_user_installation
     env["TMP"] = self.path_user_installation
     env["TMPDIR"] = self.path_user_installation

Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/mimemapper.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/mimemapper.py?rev=42080&r1=42079&r2=42080&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/mimemapper.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/mimemapper.py [utf8] Thu Jan  6 17:30:47 2011
@@ -34,7 +34,6 @@ from filter import Filter
 from os import environ, path
 from cloudooo.interfaces.mimemapper import IMimemapper
 from types import InstanceType
-from cloudooo.utils.utils import getCleanPythonEnvironment
 import json
 
 
@@ -120,8 +119,7 @@ class MimeMapper(object):
     
     stdout, stderr = Popen(command,
                            stdout=PIPE,
-                           close_fds=True,
-                           env=getCleanPythonEnvironment()).communicate()
+                           close_fds=True).communicate()
     filter_dict, type_dict = json.loads(stdout)
     for filter_name, value in filter_dict.iteritems():
       flag = value.get("Flags")

Modified: erp5/trunk/utils/cloudooo/cloudooo/utils.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/utils.py?rev=42080&r1=42079&r2=42080&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/utils.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/utils.py [utf8] Thu Jan  6 17:30:47 2011
@@ -51,14 +51,6 @@ PYTHON_ENVIRONMENT = [
 ]
 
 
-def getCleanPythonEnvironment():
-  env = environ.copy()
-  # Clean python related environment variables
-  for k in PYTHON_ENVIRONMENT:
-    env.pop(k, None)
-  return env
-
-
 def removeDirectory(path):
   """Remove directory"""
   try:

Modified: erp5/trunk/utils/cloudooo/cloudooo/utils/utils.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/utils/utils.py?rev=42080&r1=42079&r2=42080&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/utils/utils.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/utils/utils.py [utf8] Thu Jan  6 17:30:47 2011
@@ -47,14 +47,6 @@ PYTHON_ENVIRONMENT = [
 ]
 
 
-def getCleanPythonEnvironment():
-  env = environ.copy()
-  # Clean python related environment variables
-  for k in PYTHON_ENVIRONMENT:
-    env.pop(k, None)
-  return env
-
-
 def configureLogger(level=None, debug_mode=False):
   """Configure logger.
   Keyword arguments: