[Erp5-report] r16066 - in /erp5/trunk/products: ERP5Form/ ERP5Form/tests/ ERP5OOo/tests/
nobody at svn.erp5.org
nobody at svn.erp5.org
Wed Sep 5 11:57:00 CEST 2007
Author: jerome
Date: Wed Sep 5 11:57:00 2007
New Revision: 16066
URL: http://svn.erp5.org?rev=16066&view=rev
Log:
patches from Klaus Wölfel for portability:
open files in correct binary or text mode
use os.path join
use __file__ instead of looking in instance/software home
Modified:
erp5/trunk/products/ERP5Form/PDFForm.py
erp5/trunk/products/ERP5Form/tests/testPDFForm.py
erp5/trunk/products/ERP5OOo/tests/testDms.py
erp5/trunk/products/ERP5OOo/tests/testIngestion.py
erp5/trunk/products/ERP5OOo/tests/testOOoBatchMode.py
erp5/trunk/products/ERP5OOo/tests/testOOoImport.py
Modified: erp5/trunk/products/ERP5Form/PDFForm.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/PDFForm.py?rev=16066&r1=16065&r2=16066&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/PDFForm.py (original)
+++ erp5/trunk/products/ERP5Form/PDFForm.py Wed Sep 5 11:57:00 2007
@@ -96,13 +96,13 @@
if hasattr(pdfFile, "read") :
pdfFile = pdfFile.read()
- tmpPdfFile = open(pdfFormFileName, "w")
+ tmpPdfFile = open(pdfFormFileName, "wb")
tmpPdfFile.write(pdfFile)
tmpPdfFile.close()
if hasattr(fdfFile, "read") :
fdfFile = fdfFile.read()
- tmpFdfFile = open(fdfFormFileName, "w")
+ tmpFdfFile = open(fdfFormFileName, "wb")
tmpFdfFile.write(fdfFile)
tmpFdfFile.close()
Modified: erp5/trunk/products/ERP5Form/tests/testPDFForm.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/tests/testPDFForm.py?rev=16066&r1=16065&r2=16066&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/tests/testPDFForm.py (original)
+++ erp5/trunk/products/ERP5Form/tests/testPDFForm.py Wed Sep 5 11:57:00 2007
@@ -41,7 +41,7 @@
"""
self.document = Document('doc_id')
pdf_file = open(os.path.join(os.path.dirname(__file__),
- 'data', 'test_1.pdf'))
+ 'data', 'test_1.pdf'), 'rb')
self.pdf_form = PDFForm('test_pdf_form').__of__(self.document)
self.pdf_form.manage_upload(pdf_file)
Modified: erp5/trunk/products/ERP5OOo/tests/testDms.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/tests/testDms.py?rev=16066&r1=16065&r2=16066&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/tests/testDms.py (original)
+++ erp5/trunk/products/ERP5OOo/tests/testDms.py Wed Sep 5 11:57:00 2007
@@ -80,7 +80,7 @@
# Define the conversion server host
conversion_server_host = ('127.0.0.1', 8008)
-TEST_FILES_HOME = os.path.join(os.getenv('INSTANCE_HOME'), 'Products', 'ERP5OOo', 'tests', 'test_document')
+TEST_FILES_HOME = os.path.join(os.path.dirname(__file__), 'test_document')
FILE_NAME_REGULAR_EXPRESSION = "(?P<reference>[A-Z]{3,6})-(?P<language>[a-z]{2})-(?P<version>[0-9]{3})"
REFERENCE_REGULAR_EXPRESSION = "(?P<reference>[A-Z]{3,6})(-(?P<language>[a-z]{2}))?(-(?P<version>[0-9]{3}))?"
@@ -193,7 +193,7 @@
dm=self.getPortal().document_module
doctext=dm.newContent(portal_type=portal_type)
if file_name is not None:
- f = open(makeFilePath(file_name))
+ f = open(makeFilePath(file_name), 'rb')
doctext.setTextContent(f.read())
f.close()
doctext.setReference(reference)
Modified: erp5/trunk/products/ERP5OOo/tests/testIngestion.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/tests/testIngestion.py?rev=16066&r1=16065&r2=16066&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/tests/testIngestion.py (original)
+++ erp5/trunk/products/ERP5OOo/tests/testIngestion.py Wed Sep 5 11:57:00 2007
@@ -51,7 +51,7 @@
conversion_server_host = ('127.0.0.1', 8008)
# test files' home
-TEST_FILES_HOME = os.path.join(os.getenv('INSTANCE_HOME'), 'Products', 'ERP5OOo', 'tests', 'test_document')
+TEST_FILES_HOME = os.path.join(os.path.dirname(__file__), 'test_document')
FILE_NAME_REGULAR_EXPRESSION = "(?P<reference>[A-Z]{3,6})-(?P<language>[a-z]{2})-(?P<version>[0-9]{3})"
REFERENCE_REGULAR_EXPRESSION = "(?P<reference>[A-Z]{3,6})(-(?P<language>[a-z]{2}))?(-(?P<version>[0-9]{3}))?"
@@ -71,7 +71,7 @@
def __init__(self, path, name):
self.filename = name
- file.__init__(self, path)
+ file.__init__(self, path, 'rb')
self.headers = {}
def makeFilePath(name):
Modified: erp5/trunk/products/ERP5OOo/tests/testOOoBatchMode.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/tests/testOOoBatchMode.py?rev=16066&r1=16065&r2=16066&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/tests/testOOoBatchMode.py (original)
+++ erp5/trunk/products/ERP5OOo/tests/testOOoBatchMode.py Wed Sep 5 11:57:00 2007
@@ -60,20 +60,8 @@
self.login()
portal_skins = self.getSkinsTool()
portal_skins.custom.REQUEST.RESPONSE.setHeader('content-type', 'text/html')
- try:
- import_file_path = os.path.join(getConfiguration().instancehome,
- 'Products',
- 'ERP5OOo',
- 'tests',
- 'PersonSpreadsheetStylesheet' )
- except IOError:
- import_file_path = os.path.join(getConfiguration().softwarehome,
- 'Products',
- 'ERP5OOo',
- 'tests',
- 'PersonSpreadsheetStylesheet')
-
- import_file = open(import_file_path)
+ import_file_path = os.path.join(os.path.dirname(__file__), 'PersonSpreadsheetStylesheet')
+ import_file = open(import_file_path, 'rb')
addStyleSheet = portal_skins.custom.manage_addProduct['OFSP'].manage_addFile
addStyleSheet(id='Base_getODTStyleSheet', file=import_file, title='', precondition='', content_type='application/vnd.oasis.opendocument.text')
addOOoTemplate = portal_skins.custom.manage_addProduct['ERP5OOo'].addOOoTemplate
Modified: erp5/trunk/products/ERP5OOo/tests/testOOoImport.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/tests/testOOoImport.py?rev=16066&r1=16065&r2=16066&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/tests/testOOoImport.py (original)
+++ erp5/trunk/products/ERP5OOo/tests/testOOoImport.py Wed Sep 5 11:57:00 2007
@@ -81,11 +81,11 @@
def __init__(self, path, name):
self.filename = name
- file.__init__(self, path)
+ file.__init__(self, path, 'rb')
self.headers = {}
def makeFilePath(name):
- return os.getenv('INSTANCE_HOME') + '/../Products/ERP5OOo/tests/test_document/' + name
+ return os.path.join(os.path.dirname(__file__), 'test_document', name)
def makeFileUpload(name):
path = makeFilePath(name)
More information about the Erp5-report
mailing list