Simplify and reorganise, Use util.util was overkill.

cloudooo/handler/ffmpeg/handler.py

@@ -29,7 +29,7 @@
 from zope.interface import implements
 from cloudooo.interfaces.handler import IHandler
 from cloudooo.file import File
-from cloudooo.util.util import logger
+from cloudooo.util import logger
 from subprocess import Popen, PIPE
 from tempfile import mktemp
 

cloudooo/handler/ooo/application/application.py

@@ -28,8 +28,8 @@
 
 from zope.interface import implements
 from cloudooo.interfaces.application import IApplication
-from cloudooo.util.util import logger
-from cloudooo.handler.ooo.util.util import waitStopDaemon
+from cloudooo.util import logger
+from cloudooo.handler.ooo.util import waitStopDaemon
 from psutil import pid_exists, Process, AccessDenied
 
 

cloudooo/handler/ooo/application/openoffice.py

@@ -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.util.util import logger, convertStringToBool
-from cloudooo.handler.ooo.util.util import waitStartDaemon, \
+from cloudooo.util import logger, convertStringToBool
+from cloudooo.handler.ooo.util import waitStartDaemon, \
                                       removeDirectory, waitStopDaemon, \
                                       socketStatus
 

cloudooo/handler/ooo/granulator.py

@@ -30,7 +30,7 @@ from zipfile import ZipFile
 from StringIO import StringIO
 from lxml import etree
 from os import path
-from cloudooo.util.util import logger
+from cloudooo.util import logger
 from cloudooo.handler.ooo.document import OdfDocument
 
 # URI Definitions.

cloudooo/handler/ooo/handler.py

@@ -39,7 +39,7 @@ 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.monitor import monitor_sleeping_time
-from cloudooo.util.util import logger
+from cloudooo.util import logger
 from psutil import pid_exists
 
 

cloudooo/handler/ooo/monitor/memory.py

@@ -29,7 +29,7 @@
 from monitor import Monitor
 from multiprocessing import Process
 import psutil
-from cloudooo.util.util import logger
+from cloudooo.util import logger
 from time import sleep
 
 

cloudooo/handler/ooo/monitor/request.py

@@ -28,7 +28,7 @@
 
 from monitor import Monitor
 from threading import Thread
-from cloudooo.util.util import logger
+from cloudooo.util import logger
 from time import sleep
 
 

cloudooo/handler/ooo/monitor/sleeping_time.py

@@ -28,7 +28,7 @@
 
 from monitor import Monitor
 from threading import Thread
-from cloudooo.util.util import logger
+from cloudooo.util import logger
 from time import sleep, time
 
 

cloudooo/handler/ooo/monitor/timeout.py

@@ -29,7 +29,7 @@
 from monitor import Monitor
 from multiprocessing import Process
 from time import sleep
-from cloudooo.util.util import logger
+from cloudooo.util import logger
 
 
 class MonitorTimeout(Monitor, Process):

cloudooo/handler/ooo/tests/testOpenOffice.py

@@ -28,7 +28,7 @@
 
 from cloudooo.tests.handlerTestCase import HandlerTestCase, make_suite
 from cloudooo.handler.ooo.application.openoffice import OpenOffice
-from cloudooo.handler.ooo.util.util import waitStopDaemon
+from cloudooo.handler.ooo.util import waitStopDaemon
 
 OPENOFFICE = True
 

cloudooo/handler/ooo/tests/testUtil.py

@@ -28,7 +28,7 @@
 
 import unittest
 import logging
-from cloudooo.util import util
+from cloudooo import util
 from cloudooo.tests.handlerTestCase import make_suite
 import mimetypes
 

cloudooo/handler/ooo/util/util.py → cloudooo/handler/ooo/util.py

@@ -31,7 +31,7 @@ from errno import EADDRINUSE
 from time import sleep
 from os import remove
 from shutil import rmtree
-from cloudooo.util.util import logger
+from cloudooo.util import logger
 
 
 def removeDirectory(path):

cloudooo/manager.py

@@ -32,7 +32,7 @@ from mimetypes import guess_all_extensions, guess_extension
 from base64 import encodestring, decodestring
 from zope.interface import implements
 from interfaces.manager import IManager, IERP5Compatibility
-from util.util import logger
+from cloudooo.util import logger
 from cloudooo.interfaces.granulate import ITableGranulator
 from cloudooo.interfaces.granulate import IImageGranulator
 from cloudooo.interfaces.granulate import ITextGranulator

cloudooo/paster_application.py

@@ -30,7 +30,7 @@ import gc
 
 from os import path, mkdir, environ
 from cloudooo.wsgixmlrpcapplication import WSGIXMLRPCApplication
-from cloudooo.util import util
+from cloudooo import util
 
 
 def application(global_config, **local_config):

cloudooo/tests/runHandlerUnitTest.py

@@ -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.util.util import socketStatus
+from cloudooo.handler.ooo.util import socketStatus
 from signal import SIGQUIT