[Erp5-report] r41958 gabriel - in /erp5/trunk/utils/cloudooo/cloudooo: ./ handler/ooo/ hand...
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Jan 3 18:22:34 CET 2011
Author: gabriel
Date: Mon Jan 3 18:22:33 2011
New Revision: 41958
URL: http://svn.erp5.org?rev=41958&view=rev
Log:
split utils.py and add folder for this file
Added:
erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/utils/
erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/utils/__init__.py
erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/utils/utils.py
- copied, changed from r41955, erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/utils.py
erp5/trunk/utils/cloudooo/cloudooo/utils/
erp5/trunk/utils/cloudooo/cloudooo/utils/__init__.py
erp5/trunk/utils/cloudooo/cloudooo/utils/utils.py
Removed:
erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testGranulate.py
erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/utils.py
Modified:
erp5/trunk/utils/cloudooo/cloudooo/cloudooo.py
erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/application/application.py
erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/application/openoffice.py
erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/application/xvfb.py
erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/granulator.py
erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/handler.py
erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/mimemapper.py
erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/monitor/memory.py
erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/monitor/request.py
erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/monitor/timeout.py
erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/HighTestLoad.py
erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/cloudoooTestCase.py
erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/runCloudOOoUnitTest.py
erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testOpenOffice.py
erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testUtils.py
erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testXvfb.py
erp5/trunk/utils/cloudooo/cloudooo/manager.py
Modified: erp5/trunk/utils/cloudooo/cloudooo/cloudooo.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/cloudooo.py?rev=41958&r1=41957&r2=41958&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/cloudooo.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/cloudooo.py [utf8] Mon Jan 3 18:22:33 2011
@@ -32,7 +32,7 @@ from signal import signal, SIGHUP
from handler.ooo.application.openoffice import openoffice
from handler.ooo.application.xvfb import xvfb
from wsgixmlrpcapplication import WSGIXMLRPCApplication
-from handler.ooo.utils import convertStringToBool, configureLogger
+from utils.utils import convertStringToBool, configureLogger
from os import path, mkdir
from handler.ooo.mimemapper import mimemapper
Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/application/application.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/application/application.py?rev=41958&r1=41957&r2=41958&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/application/application.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/application/application.py [utf8] Mon Jan 3 18:22:33 2011
@@ -28,7 +28,8 @@
from zope.interface import implements
from cloudooo.interfaces.application import IApplication
-from cloudooo.handler.ooo.utils import logger, socketStatus, waitStopDaemon
+from cloudooo.utils.utils import logger
+from cloudooo.handler.ooo.utils.utils import socketStatus, waitStopDaemon
from psutil import pid_exists, Process
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=41958&r1=41957&r2=41958&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] Mon Jan 3 18:22:33 2011
@@ -36,9 +36,10 @@ from zope.interface import implements
from application import Application
from xvfb import xvfb
from cloudooo.interfaces.lockable import ILockable
-from cloudooo.handler.ooo.utils import logger, waitStartDaemon, \
- removeDirectory, waitStopDaemon, \
- convertStringToBool, socketStatus
+from cloudooo.utils.utils import logger, convertStringToBool
+from cloudooo.handler.ooo.utils.utils import waitStartDaemon, \
+ removeDirectory, waitStopDaemon, \
+ socketStatus
class OpenOffice(Application):
@@ -114,10 +115,10 @@ class OpenOffice(Application):
connection_list[0].local_address[1] == self.port:
process.terminate()
except psutil.error.AccessDenied, e:
- logger.error(e)
+ logger.debug(e)
except TypeError, e:
# exception to prevent one psutil issue with svn processes
- logger.error(e)
+ logger.debug(e)
except NotImplementedError, e:
logger.error("lsof isn't installed on this machine: " + str(e))
Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/application/xvfb.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/application/xvfb.py?rev=41958&r1=41957&r2=41958&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/application/xvfb.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/application/xvfb.py [utf8] Mon Jan 3 18:22:33 2011
@@ -27,7 +27,8 @@
##############################################################################
from subprocess import Popen, PIPE
-from cloudooo.handler.ooo.utils import logger, waitStartDaemon, remove_file
+from cloudooo.utils.utils import logger
+from cloudooo.handler.ooo.utils.utils import waitStartDaemon, remove_file
from zope.interface import implements
from application import Application
from cloudooo.interfaces.application import IApplication
@@ -55,7 +56,6 @@ class Xvfb(Application):
def start(self):
"""Method to start Virtual Frame Buffer."""
self.command = ["Xvfb", "-ac", ":%s" % self.display_id, \
-# "-nolisten", "tcp",
"-screen", self.virtual_screen, "800x600x16", \
"-fbdir", self.path_run_dir]
self.process = Popen(" ".join(self.command),
Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/granulator.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/granulator.py?rev=41958&r1=41957&r2=41958&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/granulator.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/granulator.py [utf8] Mon Jan 3 18:22:33 2011
@@ -31,7 +31,7 @@ from zipfile import ZipFile
from StringIO import StringIO
from lxml import etree
from os import path
-from cloudooo.handler.ooo.utils import logger
+from cloudooo.utils.utils import logger
from cloudooo.handler.ooo.document import OdfDocument
from cloudooo.interfaces.granulate import ITableGranulator, \
IImageGranulator, \
Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/handler.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/handler.py?rev=41958&r1=41957&r2=41958&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/handler.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/handler.py [utf8] Mon Jan 3 18:22:33 2011
@@ -39,7 +39,7 @@ from cloudooo.interfaces.handler import
from cloudooo.handler.ooo.mimemapper import mimemapper
from cloudooo.handler.ooo.document import FileSystemDocument
from cloudooo.handler.ooo.monitor.timeout import MonitorTimeout
-from cloudooo.handler.ooo.utils import logger
+from cloudooo.utils.utils import logger
from psutil import pid_exists
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=41958&r1=41957&r2=41958&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/mimemapper.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/mimemapper.py [utf8] Mon Jan 3 18:22:33 2011
@@ -34,7 +34,7 @@ from filter import Filter
from os import environ, path
from cloudooo.interfaces.mimemapper import IMimemapper
from types import InstanceType
-from utils import getCleanPythonEnvironment
+from cloudooo.utils.utils import getCleanPythonEnvironment
import json
Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/monitor/memory.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/monitor/memory.py?rev=41958&r1=41957&r2=41958&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/monitor/memory.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/monitor/memory.py [utf8] Mon Jan 3 18:22:33 2011
@@ -29,7 +29,7 @@
from monitor import Monitor
from multiprocessing import Process
import psutil
-from cloudooo.handler.ooo.utils import logger
+from cloudooo.utils.utils import logger
from time import sleep
Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/monitor/request.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/monitor/request.py?rev=41958&r1=41957&r2=41958&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/monitor/request.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/monitor/request.py [utf8] Mon Jan 3 18:22:33 2011
@@ -28,7 +28,7 @@
from monitor import Monitor
from threading import Thread
-from cloudooo.handler.ooo.utils import logger
+from cloudooo.utils.utils import logger
from time import sleep
Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/monitor/timeout.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/monitor/timeout.py?rev=41958&r1=41957&r2=41958&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/monitor/timeout.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/monitor/timeout.py [utf8] Mon Jan 3 18:22:33 2011
@@ -29,7 +29,7 @@
from monitor import Monitor
from multiprocessing import Process
from time import sleep
-from cloudooo.handler.ooo.utils import logger
+from cloudooo.utils.utils import logger
class MonitorTimeout(Monitor, Process):
Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/HighTestLoad.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/HighTestLoad.py?rev=41958&r1=41957&r2=41958&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/HighTestLoad.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/HighTestLoad.py [utf8] Mon Jan 3 18:22:33 2011
@@ -29,7 +29,6 @@
import sys
from multiprocessing import Process
from os import listdir
-from cloudooo.utils import usage
from xmlrpclib import ServerProxy
from os.path import join
from getopt import getopt, GetoptError
@@ -133,13 +132,13 @@ def main():
opt_list, arg_list = getopt(sys.argv[1:], "hc:n:f:s:l:", ["help"])
except GetoptError, msg:
msg = msg.msg + help_msg
- usage(sys.stderr, msg)
+ print >> sys.stderr, msg
sys.exit(2)
kw = {}
for opt, arg in opt_list:
if opt in ('-h', '--help'):
- usage(sys.stdout, __doc__)
+ print >> sys.stdout, __doc__
sys.exit(2)
elif opt == '-c':
number_client = int(arg)
Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/cloudoooTestCase.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/cloudoooTestCase.py?rev=41958&r1=41957&r2=41958&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/cloudoooTestCase.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/cloudoooTestCase.py [utf8] Mon Jan 3 18:22:33 2011
@@ -33,7 +33,7 @@ from os import path, mkdir
from os import environ, putenv
from cloudooo.handler.ooo.application.xvfb import xvfb
from cloudooo.handler.ooo.application.openoffice import openoffice
-from cloudooo.handler.ooo.utils import waitStartDaemon
+from cloudooo.handler.ooo.utils.utils import waitStartDaemon
from cloudooo.handler.ooo.mimemapper import mimemapper
config = ConfigParser()
Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/runCloudOOoUnitTest.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/runCloudOOoUnitTest.py?rev=41958&r1=41957&r2=41958&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/runCloudOOoUnitTest.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/runCloudOOoUnitTest.py [utf8] Mon Jan 3 18:22:33 2011
@@ -4,7 +4,7 @@ import sys
import unittest
from getopt import getopt, GetoptError
from time import sleep
-from cloudooo.handler.ooo.utils import socketStatus
+from cloudooo.handler.ooo.utils.utils import socketStatus
from ConfigParser import ConfigParser
from os import chdir, path, environ, curdir
from subprocess import Popen
Removed: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testGranulate.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testGranulate.py?rev=41957&view=auto
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testGranulate.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testGranulate.py (removed)
@@ -1,48 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2010 Nexedi SA and Contributors. All Rights Reserved.
-# Hugo H. Maia Vieira <hugomaia at tiolive.com>
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsibility of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# guarantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-##############################################################################
-
-import unittest
-from cloudoooTestCase import cloudoooTestCase, make_suite
-from cloudooo.manager import Manager
-
-
-class TestGranulate(cloudoooTestCase):
-
- def testGranulateFile(self):
- """Test if the granulateFile returns the grains correctly"""
- manager = Manager('some/path')
- self.assertRaises(NotImplementedError, manager.granulateFile, 'some/file',
- 'odt')
-
-
-def test_suite():
- return make_suite(TestGranulate)
-
-if __name__ == "__main__":
- suite = unittest.TestLoader().loadTestsFromTestCase(TestGranulate)
- unittest.TextTestRunner(verbosity=2).run(suite)
Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testOpenOffice.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testOpenOffice.py?rev=41958&r1=41957&r2=41958&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testOpenOffice.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testOpenOffice.py [utf8] Mon Jan 3 18:22:33 2011
@@ -30,7 +30,7 @@ import unittest
from cloudoooTestCase import cloudoooTestCase
from cloudooo.handler.ooo.application.openoffice import OpenOffice
from cloudoooTestCase import make_suite
-from cloudooo.handler.ooo.utils import waitStopDaemon
+from cloudooo.handler.ooo.utils.utils import waitStopDaemon
from psutil import Process, AccessDenied
Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testUtils.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testUtils.py?rev=41958&r1=41957&r2=41958&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testUtils.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testUtils.py [utf8] Mon Jan 3 18:22:33 2011
@@ -28,8 +28,8 @@
import unittest
import logging
-from cloudooo.handler.ooo.utils import logger, configureLogger, \
- convertStringToBool
+from cloudooo.utils.utils import logger, configureLogger, \
+ convertStringToBool
from cloudoooTestCase import make_suite
Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testXvfb.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testXvfb.py?rev=41958&r1=41957&r2=41958&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testXvfb.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/tests/testXvfb.py [utf8] Mon Jan 3 18:22:33 2011
@@ -29,7 +29,7 @@
import unittest
from cloudoooTestCase import cloudoooTestCase, make_suite
from cloudooo.handler.ooo.application.xvfb import Xvfb
-from cloudooo.hanlder.ooo.utils import waitStopDaemon
+from cloudooo.handler.ooo.utils.utils import waitStopDaemon
class TestXvfb(cloudoooTestCase):
Removed: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/utils.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/utils.py?rev=41957&view=auto
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/utils.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/utils.py (removed)
@@ -1,147 +0,0 @@
-##############################################################################
-#
-# Copyright (c) 2009-2010 Nexedi SA and Contributors. All Rights Reserved.
-# Gabriel M. Monnerat <gabriel at tiolive.com>
-#
-# WARNING: This program as such is intended to be used by professional
-# programmers who take the whole responsibility of assessing all potential
-# consequences resulting from its eventual inadequacies and bugs
-# End users who are looking for a ready-to-use solution with commercial
-# guarantees and support are strongly adviced to contract a Free Software
-# Service Company
-#
-# This program is Free Software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
-##############################################################################
-
-from socket import socket, error
-from errno import EADDRINUSE
-from time import sleep
-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:
- rmtree(path)
- except OSError, msg:
- logger.error(msg)
-
-
-def socketStatus(hostname, port):
- """Verify if the address is busy."""
- try:
- socket().bind((hostname, port),)
- # False if the is free
- return False
- except error, (num, err):
- if num == EADDRINUSE:
- # True if the isn't free
- return True
-
-
-def waitStartDaemon(daemon, attempts):
- """Wait a certain time to start the daemon."""
- for num in range(attempts):
- sleep(1)
- if daemon.status():
- return
-
-
-def waitStopDaemon(daemon, attempts=5):
- """Wait a certain time to stop the daemon."""
- for num in range(attempts):
- sleep(1)
- if not daemon.status():
- break
-
-
-def configureLogger(level=None, debug_mode=False):
- """Configure logger.
- Keyword arguments:
- level -- Level to prints the log messages
- """
- if level is None:
- level = logging.INFO
-
- if debug_mode:
- level = logging.DEBUG
-
- handler_list = logger.handlers
- if handler_list:
- for handler in iter(handler_list):
- logger.removeHandler(handler)
- # The propagate value indicates whether or not parents of this loggers will
- # be traversed when looking for handlers. It doesn't really make sense in the
- # root logger - it's just there because a root logger is almost like any
- # other logger.
- logger.propagate = 0
- logger.setLevel(level)
- # create console handler and set level to debug
- ch = logging.StreamHandler()
- ch.setLevel(level)
- # create formatter
- formatter = logging.Formatter("%(asctime).19s - %(name)s - %(levelname)s - %(message)s")
- # add formatter to ch
- ch.setFormatter(formatter)
- # add ch to logger
- logger.addHandler(ch)
-
-
-def remove_file(filepath):
- try:
- remove(filepath)
- except OSError, msg:
- print msg.strerror
-
-
-def convertStringToBool(string):
- """This function is used to convert string 'true' and 'false' only.
- Keyword arguments:
- string -- string to convert to boolean
- """
- if string.upper() == "TRUE":
- return True
- elif string.upper() == "FALSE":
- return False
- else:
- return None
Added: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/utils/__init__.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/utils/__init__.py?rev=41958&view=auto
==============================================================================
(empty)
Copied: erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/utils/utils.py (from r41955, erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/utils.py)
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/utils/utils.py?p2=erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/utils/utils.py&p1=erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/utils.py&r1=41955&r2=41958&rev=41958&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/utils.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/ooo/utils/utils.py [utf8] Mon Jan 3 18:22:33 2011
@@ -31,32 +31,7 @@ from errno import EADDRINUSE
from time import sleep
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
+from cloudooo.utils.utils import logger
def removeDirectory(path):
@@ -95,53 +70,8 @@ def waitStopDaemon(daemon, attempts=5):
break
-def configureLogger(level=None, debug_mode=False):
- """Configure logger.
- Keyword arguments:
- level -- Level to prints the log messages
- """
- if level is None:
- level = logging.INFO
-
- if debug_mode:
- level = logging.DEBUG
-
- handler_list = logger.handlers
- if handler_list:
- for handler in iter(handler_list):
- logger.removeHandler(handler)
- # The propagate value indicates whether or not parents of this loggers will
- # be traversed when looking for handlers. It doesn't really make sense in the
- # root logger - it's just there because a root logger is almost like any
- # other logger.
- logger.propagate = 0
- logger.setLevel(level)
- # create console handler and set level to debug
- ch = logging.StreamHandler()
- ch.setLevel(level)
- # create formatter
- formatter = logging.Formatter("%(asctime).19s - %(name)s - %(levelname)s - %(message)s")
- # add formatter to ch
- ch.setFormatter(formatter)
- # add ch to logger
- logger.addHandler(ch)
-
-
def remove_file(filepath):
try:
remove(filepath)
except OSError, msg:
print msg.strerror
-
-
-def convertStringToBool(string):
- """This function is used to convert string 'true' and 'false' only.
- Keyword arguments:
- string -- string to convert to boolean
- """
- if string.upper() == "TRUE":
- return True
- elif string.upper() == "FALSE":
- return False
- else:
- return None
Modified: erp5/trunk/utils/cloudooo/cloudooo/manager.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/manager.py?rev=41958&r1=41957&r2=41958&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/manager.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/manager.py [utf8] Mon Jan 3 18:22:33 2011
@@ -33,7 +33,7 @@ from zope.interface import implements
from interfaces.manager import IManager, IERP5Compatibility
from handler.ooo.handler import OOHandler
from handler.ooo.mimemapper import mimemapper
-from handler.ooo.utils import logger
+from utils.utils import logger
class Manager(object):
Added: erp5/trunk/utils/cloudooo/cloudooo/utils/__init__.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/utils/__init__.py?rev=41958&view=auto
==============================================================================
(empty)
Added: erp5/trunk/utils/cloudooo/cloudooo/utils/utils.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/utils/utils.py?rev=41958&view=auto
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/utils/utils.py (added)
+++ erp5/trunk/utils/cloudooo/cloudooo/utils/utils.py [utf8] Mon Jan 3 18:22:33 2011
@@ -0,0 +1,100 @@
+##############################################################################
+#
+# Copyright (c) 2009-2010 Nexedi SA and Contributors. All Rights Reserved.
+# Gabriel M. Monnerat <gabriel at tiolive.com>
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsibility of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# guarantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+#
+##############################################################################
+
+from os import environ
+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 configureLogger(level=None, debug_mode=False):
+ """Configure logger.
+ Keyword arguments:
+ level -- Level to prints the log messages
+ """
+ if level is None:
+ level = logging.INFO
+
+ if debug_mode:
+ level = logging.DEBUG
+
+ handler_list = logger.handlers
+ if handler_list:
+ for handler in iter(handler_list):
+ logger.removeHandler(handler)
+ # The propagate value indicates whether or not parents of this loggers will
+ # be traversed when looking for handlers. It doesn't really make sense in the
+ # root logger - it's just there because a root logger is almost like any
+ # other logger.
+ logger.propagate = 0
+ logger.setLevel(level)
+ # create console handler and set level to debug
+ ch = logging.StreamHandler()
+ ch.setLevel(level)
+ # create formatter
+ formatter = logging.Formatter("%(asctime).19s - %(name)s - %(levelname)s - %(message)s")
+ # add formatter to ch
+ ch.setFormatter(formatter)
+ # add ch to logger
+ logger.addHandler(ch)
+
+
+def convertStringToBool(string):
+ """This function is used to convert string 'true' and 'false' only.
+ Keyword arguments:
+ string -- string to convert to boolean
+ """
+ if string.upper() == "TRUE":
+ return True
+ elif string.upper() == "FALSE":
+ return False
+ else:
+ return None
More information about the Erp5-report
mailing list