[Erp5-report] r40311 gabriel - in /erp5/trunk/utils/cloudooo/cloudooo: mimemapper.py utils.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Tue Nov 16 23:12:23 CET 2010
Author: gabriel
Date: Tue Nov 16 23:12:23 2010
New Revision: 40311
URL: http://svn.erp5.org?rev=40311&view=rev
Log:
add function clean up the python environment. thanks luke
Modified:
erp5/trunk/utils/cloudooo/cloudooo/mimemapper.py
erp5/trunk/utils/cloudooo/cloudooo/utils.py
Modified: erp5/trunk/utils/cloudooo/cloudooo/mimemapper.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/mimemapper.py?rev=40311&r1=40310&r2=40311&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/mimemapper.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/mimemapper.py [utf8] Tue Nov 16 23:12:23 2010
@@ -34,6 +34,7 @@ from filter import Filter
from os import environ, path
from interfaces.mimemapper import IMimemapper
from types import InstanceType
+from utils import getCleanPythonEnvironment
from sys import executable as python_path
class MimeMapper(object):
@@ -117,7 +118,7 @@ class MimeMapper(object):
stdout, stderr = Popen(' '.join(command),
stdout=PIPE,
close_fds=True,
- shell=True).communicate()
+ shell=True, env=getCleanPythonEnvironment()).communicate()
exec(stdout)
for key, value in filter_dict.iteritems():
filter_name = key
Modified: erp5/trunk/utils/cloudooo/cloudooo/utils.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/utils.py?rev=40311&r1=40310&r2=40311&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/utils.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/utils.py [utf8] Tue Nov 16 23:12:23 2010
@@ -29,12 +29,34 @@
from socket import socket, error
from errno import EADDRINUSE
from time import sleep
-from os import remove
+from os import remove, environ
from shutil import rmtree
import logging
logger = logging.getLogger('Cloudooo')
+PYTHON_ENVIRONMENT = [
+ 'PYTHONHOME',
+ 'PYTHONPATH',
+ 'PYTHONSTARTUP',
+ 'PYTHONY2K',
+ 'PYTHONOPTIMIZE',
+ 'PYTHONDEBUG',
+ 'PYTHONDONTWRITEBYTECODE',
+ 'PYTHONINSPECT',
+ 'PYTHONNOUSERSITE',
+ 'PYTHONNOUSERSITE',
+ 'PYTHONUNBUFFERED',
+ 'PYTHONVERBOSE'
+]
+
+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:
More information about the Erp5-report
mailing list