[Erp5-report] r45491 gabriel - in /erp5/trunk/utils: cloudooo.handler.ooo/src/cloudooo/hand...
nobody at svn.erp5.org
nobody at svn.erp5.org
Fri Apr 15 13:31:44 CEST 2011
Author: gabriel
Date: Fri Apr 15 13:31:43 2011
New Revision: 45491
URL: http://svn.erp5.org?rev=45491&view=rev
Log:
refactor to don't use plurals, use sample and util instead of samples and utils
Added:
erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/helper/helper_util.py
- copied unchanged from r45490, erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/helper/helper_utils.py
erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/tests/testUtil.py
- copied, changed from r45490, erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/tests/testUtils.py
erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/util/
- copied from r45490, erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/utils/
erp5/trunk/utils/cloudooo/cloudooo/sample/
- copied from r45490, erp5/trunk/utils/cloudooo/cloudooo/samples/
erp5/trunk/utils/cloudooo/cloudooo/util/
- copied from r45490, erp5/trunk/utils/cloudooo/cloudooo/utils/
Removed:
erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/helper/helper_utils.py
erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/tests/testUtils.py
erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/utils/
erp5/trunk/utils/cloudooo/cloudooo/samples/
erp5/trunk/utils/cloudooo/cloudooo/utils/
Modified:
erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/application/application.py
erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/application/openoffice.py
erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/granulator.py
erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/handler.py
erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/helper/openoffice_tester.py
erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/helper/unoconverter.py
erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/helper/unomimemapper.py
erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/monitor/memory.py
erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/monitor/request.py
erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/monitor/sleeping_time.py
erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/monitor/timeout.py
erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/tests/testOpenOffice.py
erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/util/utils.py
erp5/trunk/utils/cloudooo/cloudooo/README.txt
erp5/trunk/utils/cloudooo/cloudooo/bin/echo_cloudooo_conf.py
erp5/trunk/utils/cloudooo/cloudooo/handler/tests/runHandlerUnitTest.py
erp5/trunk/utils/cloudooo/cloudooo/manager.py
erp5/trunk/utils/cloudooo/cloudooo/paster_application.py
Modified: erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/application/application.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/application/application.py?rev=45491&r1=45490&r2=45491&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/application/application.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/application/application.py [utf8] Fri Apr 15 13:31:43 2011
@@ -28,8 +28,8 @@
from zope.interface import implements
from cloudooo.interfaces.application import IApplication
-from cloudooo.utils.utils import logger
-from cloudooo.handler.ooo.utils.utils import waitStopDaemon
+from cloudooo.util.util import logger
+from cloudooo.handler.ooo.util.util import waitStopDaemon
from psutil import pid_exists, Process, AccessDenied
Modified: erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/application/openoffice.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/application/openoffice.py?rev=45491&r1=45490&r2=45491&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/application/openoffice.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/application/openoffice.py [utf8] Fri Apr 15 13:31:43 2011
@@ -34,8 +34,8 @@ from threading import Lock
from zope.interface import implements
from application import Application
from cloudooo.interfaces.lockable import ILockable
-from cloudooo.utils.utils import logger, convertStringToBool
-from cloudooo.handler.ooo.utils.utils import waitStartDaemon, \
+from cloudooo.util.util import logger, convertStringToBool
+from cloudooo.handler.ooo.util.util import waitStartDaemon, \
removeDirectory, waitStopDaemon, \
socketStatus
Modified: erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/granulator.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/granulator.py?rev=45491&r1=45490&r2=45491&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/granulator.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/granulator.py [utf8] Fri Apr 15 13:31:43 2011
@@ -30,7 +30,7 @@ from zipfile import ZipFile
from StringIO import StringIO
from lxml import etree
from os import path
-from cloudooo.utils.utils import logger
+from cloudooo.util.util import logger
from cloudooo.handler.ooo.document import OdfDocument
# URI Definitions.
Modified: erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/handler.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/handler.py?rev=45491&r1=45490&r2=45491&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/handler.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/handler.py [utf8] Fri Apr 15 13:31:43 2011
@@ -39,7 +39,7 @@ from cloudooo.handler.ooo.mimemapper imp
from cloudooo.handler.ooo.document import FileSystemDocument
from cloudooo.handler.ooo.monitor.timeout import MonitorTimeout
from cloudooo.handler.ooo.monitor import monitor_sleeping_time
-from cloudooo.utils.utils import logger
+from cloudooo.util.util import logger
from psutil import pid_exists
Removed: erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/helper/helper_utils.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/helper/helper_utils.py?rev=45490&view=auto
==============================================================================
--- erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/helper/helper_utils.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/helper/helper_utils.py (removed)
@@ -1,14 +0,0 @@
-def getServiceManager(host, port):
- """Get the ServiceManager from the running OpenOffice.org."""
- import uno
- # Get the uno component context from the PyUNO runtime
- uno_context = uno.getComponentContext()
- # Create the UnoUrlResolver on the Python side.
- url_resolver = "com.sun.star.bridge.UnoUrlResolver"
- resolver = uno_context.ServiceManager.createInstanceWithContext(url_resolver,
- uno_context)
- # Connect to the running OpenOffice.org and get its
- # context.
- uno_connection = resolver.resolve("uno:socket,host=%s,port=%s;urp;StarOffice.ComponentContext" % (host, port))
- # Get the ServiceManager object
- return uno_connection.ServiceManager
Modified: erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/helper/openoffice_tester.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/helper/openoffice_tester.py?rev=45491&r1=45490&r2=45491&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/helper/openoffice_tester.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/helper/openoffice_tester.py [utf8] Fri Apr 15 13:31:43 2011
@@ -1,13 +1,13 @@
#!/usr/bin/env python
import sys
-import helper_utils
+import helper_util
from getopt import getopt, GetoptError
from os import environ
def test_openoffice(hostname, port):
try:
- helper_utils.getServiceManager(hostname, port)
+ helper_util.getServiceManager(hostname, port)
return True
except Exception, err:
print err
Modified: erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/helper/unoconverter.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/helper/unoconverter.py?rev=45491&r1=45490&r2=45491&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/helper/unoconverter.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/helper/unoconverter.py [utf8] Fri Apr 15 13:31:43 2011
@@ -28,7 +28,7 @@
##############################################################################
import sys
-import helper_utils
+import helper_util
from types import UnicodeType, InstanceType
from os import environ, putenv
from os.path import dirname, exists
@@ -159,7 +159,7 @@ class UnoConverter(object):
refresh argument tells to uno environment to
replace dynamic properties of document before conversion
"""
- service_manager = helper_utils.getServiceManager(self.hostname, self.port)
+ service_manager = helper_util.getServiceManager(self.hostname, self.port)
desktop = service_manager.createInstance("com.sun.star.frame.Desktop")
uno_url = self.systemPathToFileUrl(self.document_url)
uno_document = desktop.loadComponentFromURL(uno_url, "_blank", 0, ())
@@ -219,7 +219,7 @@ class UnoConverter(object):
if field_value_str:
fieldname = document_info.getUserFieldName(number)
metadata[fieldname] = field_value_str
- service_manager = helper_utils.getServiceManager(self.hostname, self.port)
+ service_manager = helper_util.getServiceManager(self.hostname, self.port)
type_detection = service_manager.createInstance("com.sun.star.document.TypeDetection")
uno_file_access = service_manager.createInstance("com.sun.star.ucb.SimpleFileAccess")
doc = uno_file_access.openFileRead(self.systemPathToFileUrl(self.document_url))
Modified: erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/helper/unomimemapper.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/helper/unomimemapper.py?rev=45491&r1=45490&r2=45491&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/helper/unomimemapper.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/helper/unomimemapper.py [utf8] Fri Apr 15 13:31:43 2011
@@ -32,7 +32,7 @@ try:
import json
except ImportError:
import simplejson as json
-import helper_utils
+import helper_util
from os import environ, path, putenv
from getopt import getopt, GetoptError
from types import InstanceType
@@ -61,7 +61,7 @@ class UnoMimemapper(object):
""" Receives hostname and port from openoffice and create a service manager"""
self._setUpUnoEnvironment(kw.get("uno_path"),
kw.get("office_binary_path"))
- self.service_manager = helper_utils.getServiceManager(hostname, port)
+ self.service_manager = helper_util.getServiceManager(hostname, port)
def _getElementNameByService(self, uno_service, ignore_name_list=[]):
"""Returns an dict with elements."""
Modified: erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/monitor/memory.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/monitor/memory.py?rev=45491&r1=45490&r2=45491&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/monitor/memory.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/monitor/memory.py [utf8] Fri Apr 15 13:31:43 2011
@@ -29,7 +29,7 @@
from monitor import Monitor
from multiprocessing import Process
import psutil
-from cloudooo.utils.utils import logger
+from cloudooo.util.util import logger
from time import sleep
Modified: erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/monitor/request.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/monitor/request.py?rev=45491&r1=45490&r2=45491&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/monitor/request.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/monitor/request.py [utf8] Fri Apr 15 13:31:43 2011
@@ -28,7 +28,7 @@
from monitor import Monitor
from threading import Thread
-from cloudooo.utils.utils import logger
+from cloudooo.util.util import logger
from time import sleep
Modified: erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/monitor/sleeping_time.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/monitor/sleeping_time.py?rev=45491&r1=45490&r2=45491&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/monitor/sleeping_time.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/monitor/sleeping_time.py [utf8] Fri Apr 15 13:31:43 2011
@@ -28,7 +28,7 @@
from monitor import Monitor
from threading import Thread
-from cloudooo.utils.utils import logger
+from cloudooo.util.util import logger
from time import sleep, time
Modified: erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/monitor/timeout.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/monitor/timeout.py?rev=45491&r1=45490&r2=45491&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/monitor/timeout.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/monitor/timeout.py [utf8] Fri Apr 15 13:31:43 2011
@@ -29,7 +29,7 @@
from monitor import Monitor
from multiprocessing import Process
from time import sleep
-from cloudooo.utils.utils import logger
+from cloudooo.util.util import logger
class MonitorTimeout(Monitor, Process):
Modified: erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/tests/testOpenOffice.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/tests/testOpenOffice.py?rev=45491&r1=45490&r2=45491&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/tests/testOpenOffice.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/tests/testOpenOffice.py [utf8] Fri Apr 15 13:31:43 2011
@@ -28,7 +28,7 @@
from cloudooo.handler.tests.handlerTestCase import HandlerTestCase, make_suite
from cloudooo.handler.ooo.application.openoffice import OpenOffice
-from cloudooo.handler.ooo.utils.utils import waitStopDaemon
+from cloudooo.handler.ooo.util.util import waitStopDaemon
OPENOFFICE = True
Copied: erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/tests/testUtil.py (from r45490, erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/tests/testUtils.py)
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/tests/testUtil.py?p2=erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/tests/testUtil.py&p1=erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/tests/testUtils.py&r1=45490&r2=45491&rev=45491&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/tests/testUtils.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/tests/testUtil.py [utf8] Fri Apr 15 13:31:43 2011
@@ -28,43 +28,43 @@
import unittest
import logging
-from cloudooo.utils import utils
+from cloudooo.util import util
from cloudooo.handler.tests.handlerTestCase import make_suite
import mimetypes
-class TestUtils(unittest.TestCase):
+class TestUtil(unittest.TestCase):
"""Test Utils"""
def testLog(self):
"""Instanciate Log and test __call__ called function log"""
- utils.configureLogger(logging.DEBUG)
- utils.logger.info("Test Log")
- utils.logger.debug("Test Log")
- utils.configureLogger(logging.INFO)
- utils.logger.info("Test Log")
- utils.logger.debug("Test Log")
+ util.configureLogger(logging.DEBUG)
+ util.logger.info("Test Log")
+ util.logger.debug("Test Log")
+ util.configureLogger(logging.INFO)
+ util.logger.info("Test Log")
+ util.logger.debug("Test Log")
def testConversion(self):
"""Test convertion to bool"""
- self.assertTrue(utils.convertStringToBool('true'))
- self.assertEquals(utils.convertStringToBool('false'), False)
- self.assertTrue(utils.convertStringToBool('truE'))
- self.assertEquals(utils.convertStringToBool('faLse'), False)
- self.assertEquals(utils.convertStringToBool(''), None)
+ self.assertTrue(util.convertStringToBool('true'))
+ self.assertEquals(util.convertStringToBool('false'), False)
+ self.assertTrue(util.convertStringToBool('truE'))
+ self.assertEquals(util.convertStringToBool('faLse'), False)
+ self.assertEquals(util.convertStringToBool(''), None)
def testLoadMimetypelist(self):
"""Test if the file with mimetypes is loaded correctly"""
self.assertEquals(mimetypes.types_map.get(".ogv"), None)
self.assertEquals(mimetypes.types_map.get(".3gp"), None)
- utils.loadMimetypeList()
+ util.loadMimetypeList()
self.assertEquals(mimetypes.types_map.get(".ogv"), "video/ogg")
self.assertEquals(mimetypes.types_map.get(".3gp"), "video/3gpp")
def test_suite():
- return make_suite(TestUtils)
+ return make_suite(TestUtil)
if "__main__" == __name__:
- suite = unittest.TestLoader().loadTestsFromTestCase(TestUtils)
+ suite = unittest.TestLoader().loadTestsFromTestCase(TestUtil)
unittest.TextTestRunner(verbosity=2).run(suite)
Removed: erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/tests/testUtils.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/tests/testUtils.py?rev=45490&view=auto
==============================================================================
--- erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/tests/testUtils.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/tests/testUtils.py (removed)
@@ -1,70 +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.
-#
-##############################################################################
-
-import unittest
-import logging
-from cloudooo.utils import utils
-from cloudooo.handler.tests.handlerTestCase import make_suite
-import mimetypes
-
-
-class TestUtils(unittest.TestCase):
- """Test Utils"""
-
- def testLog(self):
- """Instanciate Log and test __call__ called function log"""
- utils.configureLogger(logging.DEBUG)
- utils.logger.info("Test Log")
- utils.logger.debug("Test Log")
- utils.configureLogger(logging.INFO)
- utils.logger.info("Test Log")
- utils.logger.debug("Test Log")
-
- def testConversion(self):
- """Test convertion to bool"""
- self.assertTrue(utils.convertStringToBool('true'))
- self.assertEquals(utils.convertStringToBool('false'), False)
- self.assertTrue(utils.convertStringToBool('truE'))
- self.assertEquals(utils.convertStringToBool('faLse'), False)
- self.assertEquals(utils.convertStringToBool(''), None)
-
- def testLoadMimetypelist(self):
- """Test if the file with mimetypes is loaded correctly"""
- self.assertEquals(mimetypes.types_map.get(".ogv"), None)
- self.assertEquals(mimetypes.types_map.get(".3gp"), None)
- utils.loadMimetypeList()
- self.assertEquals(mimetypes.types_map.get(".ogv"), "video/ogg")
- self.assertEquals(mimetypes.types_map.get(".3gp"), "video/3gpp")
-
-
-def test_suite():
- return make_suite(TestUtils)
-
-if "__main__" == __name__:
- suite = unittest.TestLoader().loadTestsFromTestCase(TestUtils)
- unittest.TextTestRunner(verbosity=2).run(suite)
Modified: erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/util/utils.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/util/utils.py?rev=45491&r1=45490&r2=45491&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/util/utils.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo.handler.ooo/src/cloudooo/handler/ooo/util/utils.py [utf8] Fri Apr 15 13:31:43 2011
@@ -31,7 +31,7 @@ from errno import EADDRINUSE
from time import sleep
from os import remove
from shutil import rmtree
-from cloudooo.utils.utils import logger
+from cloudooo.util.util import logger
def removeDirectory(path):
Modified: erp5/trunk/utils/cloudooo/cloudooo/README.txt
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/README.txt?rev=45491&r1=45490&r2=45491&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/README.txt [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/README.txt [utf8] Fri Apr 15 13:31:43 2011
@@ -17,7 +17,7 @@ Create Configuration File
=========================
The configuration file is used to start the application using paster.
- $ cp ./cloudooo/samples/samples.conf . # Copy to current folder
+ $ cp ./cloudooo/sample/sample.conf . # Copy to current folder
The next step is define some attributes in cloudooo.conf:
- working_path - folder to run the application. This folder need be created.
Modified: erp5/trunk/utils/cloudooo/cloudooo/bin/echo_cloudooo_conf.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/bin/echo_cloudooo_conf.py?rev=45491&r1=45490&r2=45491&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/bin/echo_cloudooo_conf.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/bin/echo_cloudooo_conf.py [utf8] Fri Apr 15 13:31:43 2011
@@ -4,6 +4,6 @@ import pkg_resources
def main():
cloudooo_conf_path = pkg_resources.resource_filename("cloudooo",
- path.join("samples", "cloudooo.conf.in"))
+ path.join("sample", "cloudooo.conf.in"))
print open(cloudooo_conf_path).read()
Modified: erp5/trunk/utils/cloudooo/cloudooo/handler/tests/runHandlerUnitTest.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/handler/tests/runHandlerUnitTest.py?rev=45491&r1=45490&r2=45491&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/handler/tests/runHandlerUnitTest.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/handler/tests/runHandlerUnitTest.py [utf8] Fri Apr 15 13:31:43 2011
@@ -9,7 +9,7 @@ from ConfigParser import ConfigParser
from argparse import ArgumentParser
from os import chdir, path, environ, curdir, remove
import psutil
-from cloudooo.handler.ooo.utils.utils import socketStatus
+from cloudooo.handler.ooo.util.util import socketStatus
from signal import SIGQUIT
Modified: erp5/trunk/utils/cloudooo/cloudooo/manager.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/manager.py?rev=45491&r1=45490&r2=45491&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/manager.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/manager.py [utf8] Fri Apr 15 13:31:43 2011
@@ -32,7 +32,7 @@ from mimetypes import guess_all_extensio
from base64 import encodestring, decodestring
from zope.interface import implements
from interfaces.manager import IManager, IERP5Compatibility
-from utils.utils import logger
+from util.util import logger
from cloudooo.interfaces.granulate import ITableGranulator
from cloudooo.interfaces.granulate import IImageGranulator
from cloudooo.interfaces.granulate import ITextGranulator
Modified: erp5/trunk/utils/cloudooo/cloudooo/paster_application.py
URL: http://svn.erp5.org/erp5/trunk/utils/cloudooo/cloudooo/paster_application.py?rev=45491&r1=45490&r2=45491&view=diff
==============================================================================
--- erp5/trunk/utils/cloudooo/cloudooo/paster_application.py [utf8] (original)
+++ erp5/trunk/utils/cloudooo/cloudooo/paster_application.py [utf8] Fri Apr 15 13:31:43 2011
@@ -30,7 +30,7 @@ import gc
from os import path, mkdir, environ
from cloudooo.wsgixmlrpcapplication import WSGIXMLRPCApplication
-from cloudooo.utils import utils
+from cloudooo.util import util
def application(global_config, **local_config):
@@ -63,8 +63,8 @@ def application(global_config, **local_c
local_config['environment_dict'] = environment_dict
gc.enable()
- debug_mode = utils.convertStringToBool(local_config.get('debug_mode'))
- utils.configureLogger(debug_mode=debug_mode)
+ debug_mode = util.convertStringToBool(local_config.get('debug_mode'))
+ util.configureLogger(debug_mode=debug_mode)
# path of directory to run cloudooo
working_path = local_config.get('working_path')
if not path.exists(working_path):
@@ -74,7 +74,7 @@ def application(global_config, **local_c
if not path.exists(cloudooo_path_tmp_dir):
mkdir(cloudooo_path_tmp_dir)
- utils.loadMimetypeList()
+ util.loadMimetypeList()
mimetype_registry = local_config.get("mimetype_registry", "")
local_config["mimetype_registry"] = handler_mapping_list = \
More information about the Erp5-report
mailing list