diff --git a/cloudooo/handler/ffmpeg/handler.py b/cloudooo/handler/ffmpeg/handler.py
index 5db3a37a3097ac7bd80997a433b97ad931bbf249..9d2a213fd5ae43eb9e7a4906f64742b1fcd584ee 100644
--- a/cloudooo/handler/ffmpeg/handler.py
+++ b/cloudooo/handler/ffmpeg/handler.py
@@ -30,7 +30,7 @@
from zope.interface import implements
from cloudooo.interfaces.handler import IHandler
from cloudooo.file import File
-from subprocess import Popen,PIPE
+from subprocess import Popen, PIPE
class FFMPEGHandler(object):
@@ -38,7 +38,7 @@ class FFMPEGHandler(object):
implements(IHandler)
- def __init__(self, base_folder_url, data, source_format,**kw):
+ def __init__(self, base_folder_url, data, source_format, **kw):
"""
base_folder_url(string)
The requested url for data base folder
@@ -53,12 +53,19 @@ class FFMPEGHandler(object):
def convert(self, destination_format, **kw):
""" Convert the inputed video to output as format that were informed """
# XXX This implementation could use ffmpeg -i pipe:0, but
- # XXX seems super unreliable currently and it generates currupted files in the end
+ # XXX seems super unreliable currently and it generates currupted files in
+ # the end
output = File(self.base_folder_url, '', destination_format)
try:
- command = [self.ffmpeg_bin, "-i",self.input.getUrl(), "-y", output.getUrl()]
- stdout, stderr = Popen(command, stdout=PIPE,
- stderr=PIPE, close_fds=True).communicate()
+ command = [self.ffmpeg_bin,
+ "-i",
+ self.input.getUrl(),
+ "-y",
+ output.getUrl()]
+ stdout, stderr = Popen(command,
+ stdout=PIPE,
+ stderr=PIPE,
+ close_fds=True).communicate()
output.reload()
return output.getContent()
finally:
diff --git a/cloudooo/handler/ffmpeg/tests/testFFMPEGHandler.py b/cloudooo/handler/ffmpeg/tests/testFFMPEGHandler.py
index ddf5aea9b8a025694e4276bc2bc33fbbaf54127f..4e66221b4e26f6e01880e32ba77041bf32604a32 100644
--- a/cloudooo/handler/ffmpeg/tests/testFFMPEGHandler.py
+++ b/cloudooo/handler/ffmpeg/tests/testFFMPEGHandler.py
@@ -26,7 +26,7 @@
#
##############################################################################
-import unittest
+import unittest
import md5
from cloudooo.handler.ffmpeg.handler import FFMPEGHandler
@@ -35,7 +35,8 @@ class TestFFMPEGHandler(unittest.TestCase):
def testConvertVideo(self):
"""Test coversion of diferents formats of video"""
- input_data = FFMPEGHandler("tests/data", open("tests/data/test.3gp").read())
+ input_data = FFMPEGHandler("tests/data",
+ open("tests/data/test.3gp").read())
hash_input = input_data.digest()
output_data = handler.convert("ogv")
hash_output = output_data.digest()
diff --git a/cloudooo/handler/ooo/application/application.py b/cloudooo/handler/ooo/application/application.py
index 69646a929bb85711be48f032a2af366804d51767..90a64b2840a495ec09819e657ce91e7867443c22 100644
--- a/cloudooo/handler/ooo/application/application.py
+++ b/cloudooo/handler/ooo/application/application.py
@@ -86,7 +86,8 @@ class Application(object):
process = Process(pid)
try:
for connection in process.get_connections():
- if connection.status == 'LISTEN' and connection.local_address[1] == self.port:
+ if connection.status == 'LISTEN' and \
+ connection.local_address[1] == self.port:
return True
except AccessDenied:
return False
diff --git a/cloudooo/handler/ooo/application/openoffice.py b/cloudooo/handler/ooo/application/openoffice.py
index 71e9e3a2ccabc99daed4476b8e143408b123a214..811474330a7d31742fef1f3f9d5f40f40737989e 100644
--- a/cloudooo/handler/ooo/application/openoffice.py
+++ b/cloudooo/handler/ooo/application/openoffice.py
@@ -39,6 +39,7 @@ from cloudooo.handler.ooo.utils.utils import waitStartDaemon, \
removeDirectory, waitStopDaemon, \
socketStatus
+
class OpenOffice(Application):
"""Object to control one OOo Instance and all features instance."""
diff --git a/cloudooo/handler/ooo/document.py b/cloudooo/handler/ooo/document.py
index 06f1fa70f9efb0f8eca9fa058dc98dde5dc04e9f..6b5b398d919e0a6c8b0b099fa28a0528b1053bfb 100644
--- a/cloudooo/handler/ooo/document.py
+++ b/cloudooo/handler/ooo/document.py
@@ -37,6 +37,7 @@ from cloudooo.file import File
class FileSystemDocument(File):
pass
+
class OdfDocument(object):
"""Manipulates odf documents in memory"""
diff --git a/cloudooo/handler/ooo/granulator.py b/cloudooo/handler/ooo/granulator.py
index baa293b3fbfc27421752f3e7f450bbf2b30638b9..e5e89ddaab4d8ad420d63756726989bf50dc2623 100644
--- a/cloudooo/handler/ooo/granulator.py
+++ b/cloudooo/handler/ooo/granulator.py
@@ -51,12 +51,14 @@ DRAW_XPATH_QUERY = './/draw:image'
TABLE_XPATH_QUERY = './/table:table'
IMAGE_TITLE_XPATH_QUERY = './/../../text() | .//../../*/text()'
+
def getTemplatePath(format):
""" Get the path of template file. This should goes to
some utils library.
"""
return path.join(path.dirname(__file__), 'template.%s' % format)
+
class OOGranulator(object):
"""Granulate an OpenOffice document into tables, images, chapters and
paragraphs."""
@@ -105,11 +107,12 @@ class OOGranulator(object):
if len(table_list) == 0:
return None
table = table_list[0]
- # Next line do this <office:content><office:body><office:text><table:table>
+ # Next line do this
+ # <office:content><office:body><office:text><table:table>
content_xml[-1][0].append(table)
- # XXX: Next line replace the <office:automatic-styles> tag. This include a
- # lot of unused style tags. Will be better detect the used styles and
- # include only those.
+ # XXX: Next line replace the <office:automatic-styles> tag. This include
+ # a lot of unused style tags. Will be better detect the used styles and
+ # include only those.
content_xml.replace(content_xml[-2],
self.document.parsed_content[-2])
@@ -139,7 +142,6 @@ class OOGranulator(object):
matrix.append(matrix_row)
return matrix
-
def getColumnItemList(self, file, table_id):
"""Return the list of columns in the form of (id, title)."""
raise NotImplementedError
@@ -194,7 +196,8 @@ class OOGranulator(object):
try:
paragraph = relevant_paragraph_list[paragraph_id]
except IndexError:
- logger.error("Unable to find paragraph %s at paragraph list." % paragraph_id)
+ msg = "Unable to find paragraph %s at paragraph list." % paragraph_id
+ logger.error(msg)
return None
text = ''.join(paragraph.itertext())
diff --git a/cloudooo/handler/ooo/handler.py b/cloudooo/handler/ooo/handler.py
index 7e7a41b9a8f27e1ef334c8d7a25510331835bab7..5182abbe9cd777a54286dc879ed87eadd386d6d6 100644
--- a/cloudooo/handler/ooo/handler.py
+++ b/cloudooo/handler/ooo/handler.py
@@ -126,11 +126,13 @@ class OOHandler:
command = self._getCommand(*feature_list, **kw)
stdout, stderr = self._subprocess(command)
if stderr != "":
- raise Exception, stderr
+ raise Exception(stderr)
return stdout, stderr
- def _serializeMimemapper(self, source_extension=None, destination_extension=None):
+ def _serializeMimemapper(self,
+ source_extension=None,
+ destination_extension=None):
"""Serialize parts of mimemapper"""
if destination_extension is None:
return json.dumps(dict(mimetype_by_filter_type=mimemapper._mimetype_by_filter_type))
diff --git a/cloudooo/handler/ooo/helper/openoffice_tester.py b/cloudooo/handler/ooo/helper/openoffice_tester.py
index 1358f32c85de271915be05c4448740f24e0c1a9f..a40241b2149d238e46e4995ba5a41f95c4e44971 100755
--- a/cloudooo/handler/ooo/helper/openoffice_tester.py
+++ b/cloudooo/handler/ooo/helper/openoffice_tester.py
@@ -17,7 +17,7 @@ def test_openoffice(hostname, port):
def main():
try:
opt_list, arg_list = getopt(sys.argv[1:], "",
- ["port=","hostname=","uno_path="])
+ ["port=", "hostname=", "uno_path="])
except GetoptError, e:
print >> sys.stderr, "%s \nUse --port and --hostname" % e
sys.exit(2)
diff --git a/cloudooo/handler/ooo/helper/unoconverter.py b/cloudooo/handler/ooo/helper/unoconverter.py
index 2607214612b60e506fc6c63a9260481833e5f620..d85d5f31a3a3572323cb88f4c3ec7cf956555960 100755
--- a/cloudooo/handler/ooo/helper/unoconverter.py
+++ b/cloudooo/handler/ooo/helper/unoconverter.py
@@ -100,8 +100,8 @@ class UnoConverter(object):
sys.path.append(uno_path)
fundamentalrc_file = '%s/fundamentalrc' % office_binary_path
if exists(fundamentalrc_file) and \
- not environ.has_key('URE_BOOTSTRAP'):
- putenv('URE_BOOTSTRAP','vnd.sun.star.pathname:%s' % fundamentalrc_file)
+ 'URE_BOOTSTRAP' not in environ:
+ putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:%s' % fundamentalrc_file)
def _createProperty(self, name, value):
"""Create property"""
@@ -133,7 +133,7 @@ class UnoConverter(object):
else:
return []
- return [property,]
+ return [property, ]
def _getFilterName(self, destination_format, type):
for filter_tuple in mimemapper["filter_list"]:
@@ -164,7 +164,7 @@ class UnoConverter(object):
uno_url = self.systemPathToFileUrl(self.document_url)
uno_document = desktop.loadComponentFromURL(uno_url, "_blank", 0, ())
if not uno_document:
- raise AttributeError, "This document can not be loaded or is empty"
+ raise AttributeError("This document can not be loaded or is empty")
if self.refresh:
# Before converting to expected format, refresh dynamic
# value inside document.
diff --git a/cloudooo/handler/ooo/helper/unomimemapper.py b/cloudooo/handler/ooo/helper/unomimemapper.py
index d179021aa8c3d7d4ab1384ff2489d89a2ddc01eb..5f95246ef3f97debded41a56374ada78dd3538b4 100755
--- a/cloudooo/handler/ooo/helper/unomimemapper.py
+++ b/cloudooo/handler/ooo/helper/unomimemapper.py
@@ -98,8 +98,8 @@ class UnoMimemapper(object):
sys.path.append(uno_path)
fundamentalrc_file = '%s/fundamentalrc' % office_binary_path
if path.exists(fundamentalrc_file) and \
- not environ.has_key('URE_BOOTSTRAP'):
- putenv('URE_BOOTSTRAP','vnd.sun.star.pathname:%s' % fundamentalrc_file)
+ 'URE_BOOTSTRAP' not in environ:
+ putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:%s' % fundamentalrc_file)
def getFilterDict(self):
"""Return all filters and your properties"""
diff --git a/cloudooo/handler/ooo/mimemapper.py b/cloudooo/handler/ooo/mimemapper.py
index 9fdcfe1ba617a65fd4959f7e205242f340fd19e0..483902ba7299120b058a969144117ce0a9e8313a 100644
--- a/cloudooo/handler/ooo/mimemapper.py
+++ b/cloudooo/handler/ooo/mimemapper.py
@@ -57,7 +57,7 @@ class MimeMapper(object):
def _addFilter(self, filter):
"""Add filter in mimemapper catalog."""
extension = filter.getExtension()
- if not self._filter_by_extension_dict.has_key(extension):
+ if extension not in self._filter_by_extension_dict:
self._filter_by_extension_dict[extension] = []
self._filter_by_extension_dict.get(extension).append(filter)
@@ -154,7 +154,7 @@ class MimeMapper(object):
# for Export filters
if flag & 0x02:
- if not self._mimetype_by_filter_type.has_key(filter_type):
+ if filter_type not in self._mimetype_by_filter_type:
self._mimetype_by_filter_type[filter_type] = mimetype
# for export filters, one extension is enough.
for ext in filter_extension_list[:1]:
@@ -181,15 +181,15 @@ class MimeMapper(object):
# hardcode 'extension -> document type' mappings according to
# soffice behaviour for extensions having several candidates.
self._doc_type_list_by_extension.update({
- 'rtf':['com.sun.star.text.TextDocument'],
- 'sxd':['com.sun.star.drawing.DrawingDocument'],
- 'txt':['com.sun.star.text.TextDocument'],
- 'odg':['com.sun.star.drawing.DrawingDocument'],
- 'html':['com.sun.star.text.WebDocument'],
- 'sda':['com.sun.star.drawing.DrawingDocument'],
- 'sdd':['com.sun.star.drawing.DrawingDocument'],
- 'pdf':['com.sun.star.drawing.DrawingDocument'],
- 'xls':['com.sun.star.sheet.SpreadsheetDocument'],
+ 'rtf': ['com.sun.star.text.TextDocument'],
+ 'sxd': ['com.sun.star.drawing.DrawingDocument'],
+ 'txt': ['com.sun.star.text.TextDocument'],
+ 'odg': ['com.sun.star.drawing.DrawingDocument'],
+ 'html': ['com.sun.star.text.WebDocument'],
+ 'sda': ['com.sun.star.drawing.DrawingDocument'],
+ 'sdd': ['com.sun.star.drawing.DrawingDocument'],
+ 'pdf': ['com.sun.star.drawing.DrawingDocument'],
+ 'xls': ['com.sun.star.sheet.SpreadsheetDocument'],
})
self.document_service_list = self._extension_list_by_type.keys()
self.extension_list_by_doc_type =\
diff --git a/cloudooo/handler/ooo/monitor/__init__.py b/cloudooo/handler/ooo/monitor/__init__.py
index 578f2db39c21bd8da9a7cc81da73b7e68920ff41..fe01bb7d1eeb4cc371ce9d08da64b4706295949b 100644
--- a/cloudooo/handler/ooo/monitor/__init__.py
+++ b/cloudooo/handler/ooo/monitor/__init__.py
@@ -7,6 +7,7 @@ monitor_request = None
monitor_memory = None
monitor_sleeping_time = None
+
def load(local_config):
"""Start the monitors"""
monitor_interval = int(local_config.get('monitor_interval'))
diff --git a/cloudooo/handler/ooo/monitor/memory.py b/cloudooo/handler/ooo/monitor/memory.py
index 5ba1abfc475335ed6017ca544b40c11231f32cfa..e5c2e8b36e8da4a276a1e87f03522f8ebc30348f 100644
--- a/cloudooo/handler/ooo/monitor/memory.py
+++ b/cloudooo/handler/ooo/monitor/memory.py
@@ -56,7 +56,7 @@ class MonitorMemory(Monitor, Process):
except TypeError:
logger.debug("OpenOffice is stopped")
return 0
- except psutil.NoSuchProcess, e:
+ except psutil.NoSuchProcess:
# Exception raised when a process with a certain PID doesn't or no longer
# exists (zombie).
return 0
diff --git a/cloudooo/handler/ooo/monitor/sleeping_time.py b/cloudooo/handler/ooo/monitor/sleeping_time.py
index b8f26493979441170b3876e35ef3b6fadd891d4b..91ffd05d6a18a650fb29237f82435767d75bd31b 100644
--- a/cloudooo/handler/ooo/monitor/sleeping_time.py
+++ b/cloudooo/handler/ooo/monitor/sleeping_time.py
@@ -28,7 +28,6 @@
from monitor import Monitor
from threading import Thread
-import psutil
from cloudooo.utils.utils import logger
from time import sleep, time
@@ -72,4 +71,3 @@ class MonitorSpleepingTime(Monitor, Thread):
self.openoffice.release()
sleep(self.interval)
logger.debug("Stop MonitorSpleepingTime")
-
diff --git a/cloudooo/handler/ooo/tests/cloudoooTestCase.py b/cloudooo/handler/ooo/tests/cloudoooTestCase.py
index cdb786c97fb9068b2468375c0d66cc683d51ddc6..5ba7fdc069e5985583c0f06865c2f8a68ec73f5d 100644
--- a/cloudooo/handler/ooo/tests/cloudoooTestCase.py
+++ b/cloudooo/handler/ooo/tests/cloudoooTestCase.py
@@ -28,10 +28,9 @@
import unittest
import sys
-from os import path, mkdir
+from os import path
from os import environ, putenv
from cloudooo.handler.ooo.application.openoffice import openoffice
-from cloudooo.handler.ooo.utils.utils import waitStartDaemon
from cloudooo.handler.ooo.mimemapper import mimemapper
from cloudooo.handler.tests.handlerTestCase import config, check_folder
@@ -67,7 +66,7 @@ def startFakeEnvironment(start_openoffice=True, conf_path=None):
fundamentalrc_file = '%s/fundamentalrc' % office_binary_path
if path.exists(fundamentalrc_file) and \
- not environ.has_key('URE_BOOTSTRAP'):
+ 'URE_BOOTSTRAP' not in environ:
putenv('URE_BOOTSTRAP', 'vnd.sun.star.pathname:%s' % fundamentalrc_file)
if start_openoffice:
@@ -90,6 +89,7 @@ def startFakeEnvironment(start_openoffice=True, conf_path=None):
openoffice.release()
return openoffice
+
def stopFakeEnvironment(stop_openoffice=True):
"""Stop Openoffice """
if stop_openoffice:
diff --git a/cloudooo/handler/ooo/tests/runCloudOOoUnitTest.py b/cloudooo/handler/ooo/tests/runCloudOOoUnitTest.py
index 25f4e5b40df132ea9cd9853c891f9d65a220650c..f56ed8a9550c84f1f08e963b912fa14051539ae0 100644
--- a/cloudooo/handler/ooo/tests/runCloudOOoUnitTest.py
+++ b/cloudooo/handler/ooo/tests/runCloudOOoUnitTest.py
@@ -88,7 +88,7 @@ def run():
process.wait()
elif OPENOFFICE:
chdir(ENVIRONMENT_PATH)
- openoffice = startFakeEnvironment(conf_path=server_cloudooo_conf)
+ startFakeEnvironment(conf_path=server_cloudooo_conf)
try:
TestRunner(verbosity=2).run(suite)
finally:
diff --git a/cloudooo/handler/ooo/tests/testAllFormats.py b/cloudooo/handler/ooo/tests/testAllFormats.py
index ec6645d23bf3a1f7a02ff2d2f087015ee890fe53..07ba10306aada3980d4c3abf3e819616ea790244 100644
--- a/cloudooo/handler/ooo/tests/testAllFormats.py
+++ b/cloudooo/handler/ooo/tests/testAllFormats.py
@@ -35,6 +35,7 @@ import magic
file_detector = magic.Magic()
DAEMON = True
+
class TestAllFormats(HandlerTestCase):
"""Test XmlRpc Server. Needs cloudooo server started"""
@@ -92,4 +93,3 @@ class TestAllFormats(HandlerTestCase):
def test_suite():
return make_suite(TestAllFormats)
-
diff --git a/cloudooo/handler/ooo/tests/testAllFormatsERP5Compatibility.py b/cloudooo/handler/ooo/tests/testAllFormatsERP5Compatibility.py
index b1f65da81c4ec75a85ef77f2603a02c46fe9e353..760c08d03cd71bbc39a162df524b2a58f6947fc5 100644
--- a/cloudooo/handler/ooo/tests/testAllFormatsERP5Compatibility.py
+++ b/cloudooo/handler/ooo/tests/testAllFormatsERP5Compatibility.py
@@ -35,6 +35,7 @@ import magic
file_detector = magic.Magic()
DAEMON = True
+
class TestAllFormatsERP5Compatibility(HandlerTestCase):
"""
Test XmlRpc Server using ERP5 compatibility API.
@@ -86,5 +87,6 @@ class TestAllFormatsERP5Compatibility(HandlerTestCase):
message = '\n'.join([template_message % fault for fault in fault_list])
self.fail('Failed Conversions:\n' + message)
+
def test_suite():
return make_suite(TestAllFormatsERP5Compatibility)
diff --git a/cloudooo/handler/ooo/tests/testApplication.py b/cloudooo/handler/ooo/tests/testApplication.py
index c55c1bca448b5b3fb6935803e01da759b7cb290f..68dd41ac3815909b3c60e9738c72b307aeec0361 100644
--- a/cloudooo/handler/ooo/tests/testApplication.py
+++ b/cloudooo/handler/ooo/tests/testApplication.py
@@ -63,4 +63,3 @@ class TestApplication(unittest.TestCase):
def test_suite():
return make_suite(TestApplication)
-
diff --git a/cloudooo/handler/ooo/tests/testFilter.py b/cloudooo/handler/ooo/tests/testFilter.py
index 4ebe0c427a340afda42c3a6c9dfa0ea9eab0211c..341b8491ceb81da9b578bcb566ac08e0329a45d6 100644
--- a/cloudooo/handler/ooo/tests/testFilter.py
+++ b/cloudooo/handler/ooo/tests/testFilter.py
@@ -56,4 +56,3 @@ class TestFilter(unittest.TestCase):
def test_suite():
return make_suite(TestFilter)
-
diff --git a/cloudooo/handler/ooo/tests/testHighLoad.py b/cloudooo/handler/ooo/tests/testHighLoad.py
index a7a13e418823f211c0dfc47634b5e3c0c1794211..6f39c0c119e6c24c1a66e1620d11597d15a02ccf 100644
--- a/cloudooo/handler/ooo/tests/testHighLoad.py
+++ b/cloudooo/handler/ooo/tests/testHighLoad.py
@@ -36,6 +36,7 @@ import magic
DAEMON = True
mime_decoder = magic.Magic(mime=True)
+
def basicTestToGenerate(id, proxy, data, source_format, destination_format,
result_list):
"""Test to use method generate of server"""
@@ -44,6 +45,7 @@ def basicTestToGenerate(id, proxy, data, source_format, destination_format,
assert mimetype == 'application/pdf'
result_list[id] = True
+
class TestHighLoad(HandlerTestCase):
"""Test with many simultaneous connection"""
@@ -56,7 +58,7 @@ class TestHighLoad(HandlerTestCase):
process_list = []
data = encodestring(open("data/test.doc", 'r').read())
LOOP = 50
- result_list = Array('i', [False]*LOOP)
+ result_list = Array('i', [False] * LOOP)
for id in range(LOOP):
process = Process(target=basicTestToGenerate, args=(id, self.proxy, data,
'doc', 'pdf',
@@ -72,4 +74,3 @@ class TestHighLoad(HandlerTestCase):
def test_suite():
return make_suite(TestHighLoad)
-
diff --git a/cloudooo/handler/ooo/tests/testMimemapper.py b/cloudooo/handler/ooo/tests/testMimemapper.py
index 010fbca5a09a2c09d4d2a6574378ed756f11cf5d..492da89f40af429b632f0123e1c26a57c79f9583 100644
--- a/cloudooo/handler/ooo/tests/testMimemapper.py
+++ b/cloudooo/handler/ooo/tests/testMimemapper.py
@@ -164,6 +164,7 @@ chart_expected_tuple = (
OPENOFFICE = True
+
class TestMimeMapper(HandlerTestCase):
"""Test if object load filters correctly of OOo."""
@@ -332,5 +333,6 @@ class TestMimeMapper(HandlerTestCase):
'com.sun.star.presentation.PresentationDocument')
self.assertEquals(filtername, "impress_html_Export")
+
def test_suite():
return make_suite(TestMimeMapper)
diff --git a/cloudooo/handler/ooo/tests/testMonitorInit.py b/cloudooo/handler/ooo/tests/testMonitorInit.py
index a6b4466477cad78c9613c66bd8f0abceb67cdff2..e22304164fa27f1e87473628b7262709bcdf9662 100644
--- a/cloudooo/handler/ooo/tests/testMonitorInit.py
+++ b/cloudooo/handler/ooo/tests/testMonitorInit.py
@@ -34,6 +34,7 @@ from cloudooo.handler.ooo.monitor.memory import MonitorMemory
OPENOFFICE = True
+
class TestMonitorInit(HandlerTestCase):
"""Test Case to test if the monitors are controlled correctly"""
@@ -74,4 +75,3 @@ class TestMonitorInit(HandlerTestCase):
def test_suite():
return make_suite(TestMonitorInit)
-
diff --git a/cloudooo/handler/ooo/tests/testMonitorMemory.py b/cloudooo/handler/ooo/tests/testMonitorMemory.py
index 498778603a9f065561d95631e1d02e1c96011d3f..d1a4662d4c826e90fbb71159debe717d64588733 100644
--- a/cloudooo/handler/ooo/tests/testMonitorMemory.py
+++ b/cloudooo/handler/ooo/tests/testMonitorMemory.py
@@ -36,6 +36,7 @@ from cloudoooTestCase import make_suite
OPENOFFICE = True
+
class TestMonitorMemory(unittest.TestCase):
"""Test case to see if the MonitorMemory is properly managing the
openoffice."""
@@ -108,4 +109,3 @@ class TestMonitorMemory(unittest.TestCase):
def test_suite():
return make_suite(TestMonitorMemory)
-
diff --git a/cloudooo/handler/ooo/tests/testMonitorRequest.py b/cloudooo/handler/ooo/tests/testMonitorRequest.py
index c5673186cc2ee27eb97b502eb34a8e203274f1d8..d1631db00c95072e4a91f30c770932878680662a 100644
--- a/cloudooo/handler/ooo/tests/testMonitorRequest.py
+++ b/cloudooo/handler/ooo/tests/testMonitorRequest.py
@@ -34,6 +34,7 @@ from cloudooo.handler.ooo.application.openoffice import openoffice
OPENOFFICE = True
+
class TestMonitorRequest(HandlerTestCase):
"""Test all features of a monitor following the interface"""
diff --git a/cloudooo/handler/ooo/tests/testMonitorTimeout.py b/cloudooo/handler/ooo/tests/testMonitorTimeout.py
index 08c15689abc570389999285cf47a85ee9c87f258..e410bad16dead7d08f6707422609652371cf63c7 100644
--- a/cloudooo/handler/ooo/tests/testMonitorTimeout.py
+++ b/cloudooo/handler/ooo/tests/testMonitorTimeout.py
@@ -34,6 +34,7 @@ from cloudoooTestCase import make_suite
OPENOFFICE = True
+
class TestMonitorTimeout(unittest.TestCase):
"""Test all features of a monitor following the interface"""
diff --git a/cloudooo/handler/ooo/tests/testOOGranulator.py b/cloudooo/handler/ooo/tests/testOOGranulator.py
index 8b741b47d1c3822151f723d8a7e4958d7acf6ae7..f65d6c66172669ae94303940bd6226bd41e276f6 100644
--- a/cloudooo/handler/ooo/tests/testOOGranulator.py
+++ b/cloudooo/handler/ooo/tests/testOOGranulator.py
@@ -100,7 +100,6 @@ class TestOOGranulator(HandlerTestCase):
self.assertEquals(None, oogranulator.getTableMatrix('Non existent'))
-
def testGetColumnItemList(self):
"""Test if getColumnItemList() returns the right table columns list"""
self.assertRaises(NotImplementedError, self.oogranulator.getColumnItemList,
diff --git a/cloudooo/handler/ooo/tests/testOOHandler.py b/cloudooo/handler/ooo/tests/testOOHandler.py
index 1ebf8885a63c52d0603c67439fa5974798fe6960..b3dd27291f5547f1913944c581be281a421ef18f 100644
--- a/cloudooo/handler/ooo/tests/testOOHandler.py
+++ b/cloudooo/handler/ooo/tests/testOOHandler.py
@@ -39,6 +39,7 @@ from zipfile import ZipFile
OPENOFFICE = True
+
class TestOOHandler(HandlerTestCase):
"""Test OOHandler and manipulation of OOo Instance"""
@@ -93,7 +94,7 @@ class TestOOHandler(HandlerTestCase):
'odt')
metadata = handler.getMetadata()
self.assertEquals(metadata.get('Data'), '')
- self.assertTrue(metadata.has_key('Data'))
+ self.assertTrue('Data' in metadata)
self.assertEquals(metadata.get('MIMEType'),
'application/vnd.oasis.opendocument.text')
handler.document.restoreOriginal()
@@ -189,6 +190,6 @@ class TestOOHandler(HandlerTestCase):
self.assertTrue(content_tree.xpath('//text:variable-get[text() = "DISPLAY ME"]',
namespaces=content_tree.nsmap))
+
def test_suite():
return make_suite(TestOOHandler)
-
diff --git a/cloudooo/handler/ooo/tests/testOdfDocument.py b/cloudooo/handler/ooo/tests/testOdfDocument.py
index b6fbf4941c02b439dca1c4586d083728ee5c9272..6e25a259bd48f6af652512eccae478785199fd3a 100644
--- a/cloudooo/handler/ooo/tests/testOdfDocument.py
+++ b/cloudooo/handler/ooo/tests/testOdfDocument.py
@@ -32,6 +32,7 @@ from cloudoooTestCase import make_suite
from cloudooo.handler.tests.handlerTestCase import HandlerTestCase
from cloudooo.handler.ooo.document import OdfDocument
+
class TestOdfDocument(HandlerTestCase):
def setUp(self):
@@ -67,4 +68,3 @@ class TestOdfDocument(HandlerTestCase):
def test_suite():
return make_suite(TestOdfDocument)
-
diff --git a/cloudooo/handler/ooo/tests/testOpenOffice.py b/cloudooo/handler/ooo/tests/testOpenOffice.py
index 1c04c71bf2727ba15ebae6daa3b2296e3ff910a0..2392a3f7bac5298855672725ef3bfefdd250bfaa 100644
--- a/cloudooo/handler/ooo/tests/testOpenOffice.py
+++ b/cloudooo/handler/ooo/tests/testOpenOffice.py
@@ -33,6 +33,7 @@ from cloudooo.handler.ooo.utils.utils import waitStopDaemon
OPENOFFICE = True
+
class TestOpenOffice(HandlerTestCase):
"""Test OpenOffice object and manipulation of OOo Instance"""
diff --git a/cloudooo/handler/ooo/tests/testServer.py b/cloudooo/handler/ooo/tests/testServer.py
index fb65670b89fa143a2475d1abeedfe44d77fba0c2..a5e0bac9427dbfec1609c7afa7ff7c3cacb72c2c 100644
--- a/cloudooo/handler/ooo/tests/testServer.py
+++ b/cloudooo/handler/ooo/tests/testServer.py
@@ -38,6 +38,7 @@ import magic
DAEMON = True
+
class TestServer(HandlerTestCase):
"""Test XmlRpc Server. Needs cloudooo server started"""
@@ -115,7 +116,6 @@ class TestServer(HandlerTestCase):
content_type = self._getFileType(output_url)
self.assertEquals(content_type, stdout_msg)
-
def _getFileType(self, output_url):
mime = magic.Magic(mime=True)
return mime.from_file(output_url)
@@ -174,7 +174,7 @@ class TestServer(HandlerTestCase):
def testgetFileMetadataItemListWithoutData(self):
"""Test server using method getFileMetadataItemList. Without data
converted"""
- data = open(join('data','testMetadata.odt'),'r').read()
+ data = open(join('data', 'testMetadata.odt'), 'r').read()
metadata_dict = self.proxy.getFileMetadataItemList(encodestring(data),
'odt')
self.assertEquals(metadata_dict.get("Data"), '')
@@ -188,7 +188,7 @@ class TestServer(HandlerTestCase):
def testgetFileMetadataItemListWithData(self):
"""Test server using method getFileMetadataItemList. With data converted"""
document_output_url = join(self.tmp_url, "testGetMetadata.odt")
- data = open(join('data','testMetadata.odt'),'r').read()
+ data = open(join('data', 'testMetadata.odt'), 'r').read()
metadata_dict = self.proxy.getFileMetadataItemList(encodestring(data),
"odt",
True)
@@ -206,9 +206,9 @@ class TestServer(HandlerTestCase):
def testupdateFileMetadata(self):
"""Test server using method updateFileMetadata"""
document_output_url = join(self.tmp_url, "testSetMetadata.odt")
- data = open(join('data','testMetadata.odt'),'r').read()
+ data = open(join('data', 'testMetadata.odt'), 'r').read()
odf_data = self.proxy.updateFileMetadata(encodestring(data), 'odt',
- {"Title":"testSetMetadata"})
+ {"Title": "testSetMetadata"})
open(document_output_url, 'w').write(decodestring(odf_data))
content_type = self._getFileType(document_output_url)
self.assertEquals(content_type, 'application/vnd.oasis.opendocument.text')
@@ -220,11 +220,11 @@ class TestServer(HandlerTestCase):
def testupdateFileMetadataWithUserMetadata(self):
"""Test server using method updateFileMetadata with unsual metadata"""
document_output_url = join(self.tmp_url, "testSetMetadata.odt")
- data = open(join('data','testMetadata.odt'),'r').read()
+ data = open(join('data', 'testMetadata.odt'), 'r').read()
odf_data = self.proxy.updateFileMetadata(encodestring(data),
- 'odt',
- {"Reference":"testSetMetadata"})
+ 'odt',
+ {"Reference": "testSetMetadata"})
open(document_output_url, 'w').write(decodestring(odf_data))
content_type = self._getFileType(document_output_url)
self.assertEquals(content_type, 'application/vnd.oasis.opendocument.text')
@@ -235,11 +235,11 @@ class TestServer(HandlerTestCase):
"""Test server using method updateFileMetadata when the same metadata is
updated"""
document_output_url = join(self.tmp_url, "testSetMetadata.odt")
- data = open(join('data','testMetadata.odt'),'r').read()
+ data = open(join('data', 'testMetadata.odt'), 'r').read()
odf_data = self.proxy.updateFileMetadata(encodestring(data), 'odt',
- {"Reference":"testSetMetadata", "Something":"ABC"})
+ {"Reference": "testSetMetadata", "Something": "ABC"})
new_odf_data = self.proxy.updateFileMetadata(odf_data, 'odt',
- {"Reference":"new value", "Something": "ABC"})
+ {"Reference": "new value", "Something": "ABC"})
open(document_output_url, 'w').write(decodestring(new_odf_data))
content_type = self._getFileType(document_output_url)
self.assertEquals(content_type, 'application/vnd.oasis.opendocument.text')
@@ -250,13 +250,13 @@ class TestServer(HandlerTestCase):
def testupdateFileMetadataAlreadyHasMetadata(self):
"""Test document that already has metadata. Check if the metadata is not
deleted"""
- data = open(join('data','testMetadata.odt'),'r').read()
+ data = open(join('data', 'testMetadata.odt'), 'r').read()
metadata_dict = self.proxy.getFileMetadataItemList(encodestring(data), 'odt')
self.assertEquals(metadata_dict["Description"], "cloudooo Comments")
self.assertEquals(metadata_dict["Keywords"], "Keywords Test")
self.assertEquals(metadata_dict["Title"], "cloudooo Test")
odf_data = self.proxy.updateFileMetadata(encodestring(data), 'odt',
- {"Title":"cloudooo Title"})
+ {"Title": "cloudooo Title"})
odf_metadata_dict = self.proxy.getFileMetadataItemList(odf_data, 'odt')
self.assertEquals(odf_metadata_dict["Description"], "cloudooo Comments")
self.assertEquals(odf_metadata_dict["Keywords"], "Keywords Test")
@@ -328,17 +328,17 @@ class TestServer(HandlerTestCase):
def testConvertDocumentToInvalidFormat(self):
"""Try convert one document for a invalid format"""
- data = open(join('data','test.doc'),'r').read()
+ data = open(join('data', 'test.doc'), 'r').read()
self.assertRaises(Fault, self.proxy.convertFile, (data, 'doc', 'xyz'))
def testConvertDocumentToImpossibleFormat(self):
"""Try convert one document to format not possible"""
- data = open(join('data','test.odp'),'r').read()
+ data = open(join('data', 'test.odp'), 'r').read()
self.assertRaises(Fault, self.proxy.convertFile, (data, 'odp', 'doc'))
def testRunConvertMethod(self):
"""Test run_convert method"""
- data = open(join('data','test.doc'),'r').read()
+ data = open(join('data', 'test.doc'), 'r').read()
response_code, response_dict, response_message = \
self.proxy.run_convert('test.doc', encodestring(data))
self.assertEquals(response_code, 200)
@@ -352,7 +352,7 @@ class TestServer(HandlerTestCase):
def testRunConvertFailResponse(self):
"""Test run_convert method with invalid file"""
- data = open(join('data', 'test.doc'),'r').read()[:30]
+ data = open(join('data', 'test.doc'), 'r').read()[:30]
response_code, response_dict, response_message = \
self.proxy.run_convert('test.doc', encodestring(data))
self.assertEquals(response_code, 402)
@@ -364,7 +364,7 @@ class TestServer(HandlerTestCase):
def testRunGenerateMethod(self):
"""Test run_generate method"""
- data = open(join('data', 'test.odt'),'r').read()
+ data = open(join('data', 'test.odt'), 'r').read()
generate_result = self.proxy.run_generate('test.odt',
encodestring(data),
None, 'pdf',
@@ -378,7 +378,7 @@ class TestServer(HandlerTestCase):
def testRunGenerateMethodConvertOdsToHTML(self):
"""Test run_generate method. This test is to validate a bug convertions to
html"""
- data = open(join('data', 'test.ods'),'r').read()
+ data = open(join('data', 'test.ods'), 'r').read()
generate_result = self.proxy.run_generate('test.ods',
encodestring(data),
None, 'html',
@@ -402,7 +402,7 @@ class TestServer(HandlerTestCase):
def testPNGFileToConvertOdpToHTML(self):
"""Test run_generate method. This test if returns good png files"""
- data = open(join('data', 'test_png.odp'),'r').read()
+ data = open(join('data', 'test_png.odp'), 'r').read()
generate_result = self.proxy.run_generate('test_png.odp',
encodestring(data),
None, 'html',
@@ -431,7 +431,7 @@ class TestServer(HandlerTestCase):
def testRunGenerateMethodConvertOdpToHTML(self):
"""Test run_generate method. This test is to validate a bug convertions to
html"""
- data = open(join('data','test.odp'),'r').read()
+ data = open(join('data', 'test.odp'), 'r').read()
generate_result = self.proxy.run_generate('test.odp',
encodestring(data),
None, 'html',
@@ -455,7 +455,7 @@ class TestServer(HandlerTestCase):
# document.
def _testRunGenerateMethodFailResponse(self):
"""Test run_generate method with invalid document"""
- data = open(join('data','test.odt'), 'r').read()[:100]
+ data = open(join('data', 'test.odt'), 'r').read()[:100]
generate_result = self.proxy.run_generate('test.odt',
encodestring(data),
None, 'pdf', 'application/vnd.oasis.opendocument.text')
@@ -467,10 +467,10 @@ class TestServer(HandlerTestCase):
def testRunSetMetadata(self):
"""Test run_setmetadata method"""
- data = open(join('data','testMetadata.odt'),'r').read()
+ data = open(join('data', 'testMetadata.odt'), 'r').read()
setmetadata_result = self.proxy.run_setmetadata('testMetadata.odt',
encodestring(data),
- {"Title":"testSetMetadata", "Description": "Music"})
+ {"Title": "testSetMetadata", "Description": "Music"})
response_code, response_dict, response_message = setmetadata_result
self.assertEquals(response_code, 200)
self.assertNotEquals(response_dict['data'], '')
@@ -483,7 +483,7 @@ class TestServer(HandlerTestCase):
self.assertEquals(response_dict['meta']['Description'], "Music")
setmetadata_result = self.proxy.run_setmetadata('testMetadata.odt',
encodestring(data),
- {"Title":"Namie's working record",
+ {"Title": "Namie's working record",
"Description": "Music"})
response_code, response_dict, response_message = setmetadata_result
getmetadata_result = self.proxy.run_getmetadata('testMetadata.odt',
@@ -495,10 +495,10 @@ class TestServer(HandlerTestCase):
def testRunSetMetadataFailResponse(self):
"""Test run_setmetadata method with invalid document"""
- data = open(join('data','testMetadata.odt'),'r').read()[:100]
+ data = open(join('data', 'testMetadata.odt'), 'r').read()[:100]
setmetadata_result = self.proxy.run_setmetadata('testMetadata.odt',
encodestring(data),
- {"Title":"testSetMetadata", "Description": "Music"})
+ {"Title": "testSetMetadata", "Description": "Music"})
response_code, response_dict, response_message = setmetadata_result
self.assertEquals(response_code, 402)
self.assertEquals(response_dict, {})
@@ -517,4 +517,3 @@ class TestServer(HandlerTestCase):
def test_suite():
return make_suite(TestServer)
-
diff --git a/cloudooo/handler/ooo/tests/testUnoConverter.py b/cloudooo/handler/ooo/tests/testUnoConverter.py
index af17afe754e5f3babc7f5375372679ef880fa0fa..bdb97b74700a31fde100b2b8692cf0497854df2d 100644
--- a/cloudooo/handler/ooo/tests/testUnoConverter.py
+++ b/cloudooo/handler/ooo/tests/testUnoConverter.py
@@ -38,6 +38,7 @@ from cloudooo.handler.ooo.document import FileSystemDocument
OPENOFFICE = True
+
class TestUnoConverter(HandlerTestCase):
"""Test case to test all features of the unoconverter script"""
diff --git a/cloudooo/handler/ooo/tests/testUnoMimemapper.py b/cloudooo/handler/ooo/tests/testUnoMimemapper.py
index 9698a84fa644a768f2e8027b3258dedbd3c4f907..80552c091815cbf0e36289f2dc22e8674034c329 100644
--- a/cloudooo/handler/ooo/tests/testUnoMimemapper.py
+++ b/cloudooo/handler/ooo/tests/testUnoMimemapper.py
@@ -36,6 +36,7 @@ from cloudooo.handler.tests.handlerTestCase import HandlerTestCase
OPENOFFICE = True
+
class TestUnoMimeMapper(HandlerTestCase):
"""Test Case to test all features of script unomimemapper"""
@@ -119,4 +120,3 @@ class TestUnoMimeMapper(HandlerTestCase):
def test_suite():
return make_suite(TestUnoMimeMapper)
-
diff --git a/cloudooo/handler/ooo/utils/utils.py b/cloudooo/handler/ooo/utils/utils.py
index b5f92dba9b5a5868897cb547d60cc4f69d269581..ed1cb4694f028e462827b4ea724e487e0e1d4373 100644
--- a/cloudooo/handler/ooo/utils/utils.py
+++ b/cloudooo/handler/ooo/utils/utils.py
@@ -29,7 +29,7 @@
from socket import socket, error
from errno import EADDRINUSE
from time import sleep
-from os import remove, environ
+from os import remove
from shutil import rmtree
from cloudooo.utils.utils import logger
diff --git a/cloudooo/handler/pdf/handler.py b/cloudooo/handler/pdf/handler.py
index a75e6c1b556db97eb131149083c697307ac7cea4..757c929d7c7e70eebeb046e6c43a8fd6d2d0709b 100644
--- a/cloudooo/handler/pdf/handler.py
+++ b/cloudooo/handler/pdf/handler.py
@@ -31,7 +31,6 @@ from cloudooo.interfaces.handler import IHandler
from cloudooo.file import File
from subprocess import Popen, PIPE
from tempfile import mktemp
-from os import path
class PDFHandler(object):
@@ -43,6 +42,7 @@ class PDFHandler(object):
""" Load pdf document """
self.base_folder_url = base_folder_url
self.document = File(base_folder_url, data, source_format)
+ self.environment = kw.get("env", {})
def convert(self, destination_format=None, **kw):
""" Convert a pdf document """
@@ -52,7 +52,8 @@ class PDFHandler(object):
command = ["pdftotext", self.document.getUrl(), output_url]
stdout, stderr = Popen(command,
stdout=PIPE,
- stderr=PIPE).communicate()
+ stderr=PIPE,
+ env=self.environment).communicate()
try:
return open(output_url).read()
finally:
@@ -66,7 +67,8 @@ class PDFHandler(object):
command = ["pdfinfo", self.document.getUrl()]
stdout, stderr = Popen(command,
stdout=PIPE,
- stderr=PIPE).communicate()
+ stderr=PIPE,
+ env=self.environment).communicate()
info_list = filter(None, stdout.split("\n"))
metadata = {}
for info in iter(info_list):
diff --git a/cloudooo/handler/pdf/tests/runPDFHandlerUnitTest.py b/cloudooo/handler/pdf/tests/runPDFHandlerUnitTest.py
index 53d090b0536313e113fe87d89f767456d62027d7..ce28d76cc90c01b4945208a3fc3cac95bd481915 100644
--- a/cloudooo/handler/pdf/tests/runPDFHandlerUnitTest.py
+++ b/cloudooo/handler/pdf/tests/runPDFHandlerUnitTest.py
@@ -10,7 +10,8 @@ ENVIRONMENT_PATH = path.abspath(path.dirname(__file__))
def exit(msg):
sys.stderr.write(msg)
- sys.exit(0)
+ sys.exit(0)
+
# XXX - Duplicated function. This function must be generic to be used by all handlers
def run():
@@ -32,7 +33,7 @@ def run():
python_extension = '.py'
if test_name[-3:] == python_extension:
test_name = test_name[:-3]
- if not path.exists(path.join(ENVIRONMENT_PATH,
+ if not path.exists(path.join(ENVIRONMENT_PATH,
'%s%s' % (test_name, python_extension))):
exit("%s not exists\n" % test_name)
diff --git a/cloudooo/handler/pdf/tests/testPDFHandler.py b/cloudooo/handler/pdf/tests/testPDFHandler.py
index 5ef63f0d3e93d457e61fcfbc78784cd768df0525..a1bce8473450cd491f1d86694db5025fecf2ec5b 100644
--- a/cloudooo/handler/pdf/tests/testPDFHandler.py
+++ b/cloudooo/handler/pdf/tests/testPDFHandler.py
@@ -45,7 +45,8 @@ class TestPDFHandler(HandlerTestCase):
def testgetMetadata(self):
"""Test if the metadata are extracted correctly"""
pdf_document = open("data/test.pdf").read()
- handler = PDFHandler(self.tmp_url, pdf_document, "pdf")
+ kw = dict(env=dict(PATH="/hd/cloudooo_handler_ooo/software/parts/xpdf/bin"))
+ handler = PDFHandler(self.tmp_url, pdf_document, "pdf", **kw)
metadata = handler.getMetadata()
self.assertEquals(type(metadata), DictType)
self.assertNotEquals(metadata, {})
@@ -53,6 +54,6 @@ class TestPDFHandler(HandlerTestCase):
def test_suite():
- suite = unittest.TestSuite()
+ suite = unittest.TestSuite()
suite.addTest(unittest.makeSuite(TestPDFHandler))
return suite
diff --git a/cloudooo/handler/tests/handlerTestCase.py b/cloudooo/handler/tests/handlerTestCase.py
index fe9badd5b69b06c2a9e1a4439b455f141aeac9a8..c7383d0d365c6d5d4c3ff2f699e8c85f369d3bae 100644
--- a/cloudooo/handler/tests/handlerTestCase.py
+++ b/cloudooo/handler/tests/handlerTestCase.py
@@ -34,12 +34,14 @@ import sys
config = ConfigParser()
+
def check_folder(working_path, tmp_dir_path):
if not path.exists(working_path):
mkdir(working_path)
if not path.exists(tmp_dir_path):
mkdir(tmp_dir_path)
+
class HandlerTestCase(unittest.TestCase):
"""Test Case to load cloudooo conf."""
diff --git a/cloudooo/interfaces/file.py b/cloudooo/interfaces/file.py
index cd32f37f75713e1158b0b3f5671c8c217fcde9eb..21e1c6b856523322071a69a9c28c73cffdbb6fb7 100644
--- a/cloudooo/interfaces/file.py
+++ b/cloudooo/interfaces/file.py
@@ -41,7 +41,8 @@ class IFile(Interface):
original_data = Attribute("Original data")
def load():
- """From the data creates one archive into file system using original data"""
+ """From the data creates one archive into file system using original data
+ """
def reload(url):
"""In the case of another file with the same content be created, pass the
diff --git a/cloudooo/interfaces/granulate.py b/cloudooo/interfaces/granulate.py
index 7cafe425156688fa6737ce732646071dc0f6aa43..4e1313b751fa450feb16750dd9e9bda8f80421fa 100644
--- a/cloudooo/interfaces/granulate.py
+++ b/cloudooo/interfaces/granulate.py
@@ -62,8 +62,8 @@ class ITextGranulator(Interface):
"""Provides methods to granulate a document into chapters and paragraphs."""
def getParagraphItemList():
- """Returns the list of paragraphs in the form of (id, class) where class may
- have special meaning to define TOC/TOI."""
+ """Returns the list of paragraphs in the form of (id, class) where class
+ may have special meaning to define TOC/TOI."""
def getParagraphItem(paragraph_id):
"""Returns the paragraph in the form of (text, class)."""
diff --git a/cloudooo/manager.py b/cloudooo/manager.py
index d5d9094d81c08c2ffdf05a5a96e1963deb670b43..99cfa820cda4f2ea6353633dea8e4fe91057fc78 100644
--- a/cloudooo/manager.py
+++ b/cloudooo/manager.py
@@ -56,7 +56,8 @@ class Manager(object):
zip archive
"""
if not mimemapper.getFilterList(destination_format):
- raise ValueError, "This format (%s) is not supported or is invalid" % destination_format
+ raise ValueError("This format (%s) is not supported " +
+ "or is invalid" % destination_format)
self.kw['zip'] = zip
self.kw['refresh'] = refresh
document = OOHandler(self._path_tmp_dir,
@@ -243,7 +244,10 @@ class Manager(object):
try:
response_dict = {}
# XXX - use html format instead of xhtml
- if orig_format in ("presentation", "graphics", "spreadsheet", 'text') and extension == "xhtml":
+ if orig_format in ("presentation",
+ "graphics",
+ "spreadsheet",
+ 'text') and extension == "xhtml":
extension = 'html'
response_dict['data'] = self.convertFile(data,
original_extension,
diff --git a/cloudooo/paster_application.py b/cloudooo/paster_application.py
index 748ba6fe58822acec8f5cd4eb68ae7ca05bcc95f..4fac464af995401c7d45b19911d0318760e91ecf 100644
--- a/cloudooo/paster_application.py
+++ b/cloudooo/paster_application.py
@@ -27,20 +27,21 @@
##############################################################################
import gc
-from signal import signal, SIGTERM, SIGINT, SIGQUIT, SIGHUP
+from signal import signal, SIGINT, SIGQUIT, SIGHUP
from os import path, mkdir
import os
-
import cloudooo.handler.ooo.monitor as monitor
from cloudooo.handler.ooo.application.openoffice import openoffice
from cloudooo.wsgixmlrpcapplication import WSGIXMLRPCApplication
from cloudooo.utils.utils import convertStringToBool, configureLogger
from cloudooo.handler.ooo.mimemapper import mimemapper
+
def stopProcesses(signum, frame):
monitor.stop()
openoffice.stop()
+
def application(global_config, **local_config):
"""Method to load all configuration of cloudooo and start the application.
To start the application a number of params are required:
@@ -83,14 +84,14 @@ def application(global_config, **local_config):
# Loading Configuration to start OOo Instance and control it
openoffice.loadSettings(application_hostname,
- openoffice_port,
- working_path,
- local_config.get('office_binary_path'),
- local_config.get('uno_path'),
- local_config.get('openoffice_user_interface_language',
- 'en'),
- environment_dict=environment_dict,
- )
+ openoffice_port,
+ working_path,
+ local_config.get('office_binary_path'),
+ local_config.get('uno_path'),
+ local_config.get('openoffice_user_interface_language',
+ 'en'),
+ environment_dict=environment_dict,
+ )
openoffice.start()
monitor.load(local_config)
diff --git a/cloudooo/utils/utils.py b/cloudooo/utils/utils.py
index b54995d5f853f66d853202fefed1a39af123fdbf..5c616b6b257ac5cf972322c78b413c5e909ba55d 100644
--- a/cloudooo/utils/utils.py
+++ b/cloudooo/utils/utils.py
@@ -26,7 +26,6 @@
#
##############################################################################
-from os import environ
import logging
logger = logging.getLogger('Cloudooo')
@@ -72,7 +71,8 @@ def configureLogger(level=None, debug_mode=False):
ch = logging.StreamHandler()
ch.setLevel(level)
# create formatter
- formatter = logging.Formatter("%(asctime).19s - %(name)s - %(levelname)s - %(message)s")
+ format = "%(asctime).19s - %(name)s - %(levelname)s - %(message)s"
+ formatter = logging.Formatter(format)
# add formatter to ch
ch.setFormatter(formatter)
# add ch to logger