Commit d76fce32 authored by Arnaud Fontaine's avatar Arnaud Fontaine

Cosmetic changes and remove unused imports.

parent 57d21dfa
...@@ -440,7 +440,7 @@ class BalanceTransaction(AccountingTransaction, Inventory): ...@@ -440,7 +440,7 @@ class BalanceTransaction(AccountingTransaction, Inventory):
return factory return factory
def _immediateReindexObject(self, **kw): def _immediateReindexObject(self, *args, **kw):
"""Reindexes the object. """Reindexes the object.
This is different indexing that the default Inventory indexing, because This is different indexing that the default Inventory indexing, because
we want to take into account that lines in this balance transaction to we want to take into account that lines in this balance transaction to
......
...@@ -26,7 +26,7 @@ section_region = section.getRegion() ...@@ -26,7 +26,7 @@ section_region = section.getRegion()
ledger = request.get("ledger", None) ledger = request.get("ledger", None)
if ledger is not None: if ledger is not None:
portal_categories = context.getPortalObject().portal_categories portal_categories = context.getPortalObject().portal_categories
if isinstance(ledger, list) or isinstance(ledger, tuple): if isinstance(ledger, (tuple, list)):
ledger_uid = [portal_categories.ledger.restrictedTraverse(item).getUid() for item in ledger] ledger_uid = [portal_categories.ledger.restrictedTraverse(item).getUid() for item in ledger]
else: else:
ledger_uid = portal_categories.ledger.restrictedTraverse(ledger).getUid() ledger_uid = portal_categories.ledger.restrictedTraverse(ledger).getUid()
......
...@@ -23,7 +23,7 @@ kw['where_expression'] = " section.portal_type = 'Organisation' " ...@@ -23,7 +23,7 @@ kw['where_expression'] = " section.portal_type = 'Organisation' "
ledger = kw.get('ledger', request.get("ledger", None)) ledger = kw.get('ledger', request.get("ledger", None))
if ledger is not None: if ledger is not None:
portal_categories = context.getPortalObject().portal_categories portal_categories = context.getPortalObject().portal_categories
if isinstance(ledger, list) or isinstance(ledger, tuple): if isinstance(ledger, (tuple, list)):
kw['ledger_uid'] = [portal_categories.ledger.restrictedTraverse(item).getUid() for item in ledger] kw['ledger_uid'] = [portal_categories.ledger.restrictedTraverse(item).getUid() for item in ledger]
else: else:
kw['ledger_uid'] = portal_categories.ledger.restrictedTraverse(ledger).getUid() kw['ledger_uid'] = portal_categories.ledger.restrictedTraverse(ledger).getUid()
......
...@@ -22,7 +22,7 @@ kw['where_expression'] = " section.portal_type = 'Organisation' " ...@@ -22,7 +22,7 @@ kw['where_expression'] = " section.portal_type = 'Organisation' "
ledger = kwd.get('ledger', request.get("ledger", None)) ledger = kwd.get('ledger', request.get("ledger", None))
if ledger is not None: if ledger is not None:
portal_categories = context.getPortalObject().portal_categories portal_categories = context.getPortalObject().portal_categories
if isinstance(ledger, list) or isinstance(ledger, tuple): if isinstance(ledger, (tuple, list)):
kw['ledger_uid'] = [portal_categories.ledger.restrictedTraverse(item).getUid() for item in ledger] kw['ledger_uid'] = [portal_categories.ledger.restrictedTraverse(item).getUid() for item in ledger]
else: else:
kw['ledger_uid'] = portal_categories.ledger.restrictedTraverse(ledger).getUid() kw['ledger_uid'] = portal_categories.ledger.restrictedTraverse(ledger).getUid()
......
...@@ -27,7 +27,7 @@ kw['where_expression'] = " section.portal_type = 'Organisation' " ...@@ -27,7 +27,7 @@ kw['where_expression'] = " section.portal_type = 'Organisation' "
ledger = kwd.get('ledger', request.get("ledger", None)) ledger = kwd.get('ledger', request.get("ledger", None))
if ledger is not None: if ledger is not None:
portal_categories = context.getPortalObject().portal_categories portal_categories = context.getPortalObject().portal_categories
if isinstance(ledger, list) or isinstance(ledger, tuple): if isinstance(ledger, (tuple, list)):
kw['ledger_uid'] = [portal_categories.ledger.restrictedTraverse(item).getUid() for item in ledger] kw['ledger_uid'] = [portal_categories.ledger.restrictedTraverse(item).getUid() for item in ledger]
else: else:
kw['ledger_uid'] = portal_categories.ledger.restrictedTraverse(ledger).getUid() kw['ledger_uid'] = portal_categories.ledger.restrictedTraverse(ledger).getUid()
...@@ -47,7 +47,7 @@ accounts_to_expand_by_tp = rec_cat.getAccountTypeRelatedValueList(**params) + \ ...@@ -47,7 +47,7 @@ accounts_to_expand_by_tp = rec_cat.getAccountTypeRelatedValueList(**params) + \
total_balance = 0.0 total_balance = 0.0
for account_gap_number in accounts: for account_gap_number in accounts:
# We get all acounts strict member of this GAP category # We get all accounts strict member of this GAP category
gap = context.restrictedTraverse('portal_categories/' + getURL(account_gap_number)) gap = context.restrictedTraverse('portal_categories/' + getURL(account_gap_number))
for account in gap.getGapRelatedValueList(portal_type='Account'): for account in gap.getGapRelatedValueList(portal_type='Account'):
......
...@@ -207,7 +207,7 @@ class CategoryBudgetVariation(BudgetVariation): ...@@ -207,7 +207,7 @@ class CategoryBudgetVariation(BudgetVariation):
security.declareProtected(Permissions.AccessContentsInformation, security.declareProtected(Permissions.AccessContentsInformation,
'getBudgetVariationRangeCategoryList') 'getBudgetVariationRangeCategoryList')
def getBudgetVariationRangeCategoryList(self, context): def getBudgetVariationRangeCategoryList(self, _):
"""Returns the Variation Range Category List that can be applied to this """Returns the Variation Range Category List that can be applied to this
budget. budget.
""" """
......
...@@ -15,6 +15,6 @@ for inventory in stool.getInventoryList( ...@@ -15,6 +15,6 @@ for inventory in stool.getInventoryList(
resource_list.append( resource_list.append(
(inventory.resource_relative_url, (inventory.resource_relative_url,
portal.portal_categories.restrictedTraverse( portal.portal_categories.restrictedTraverse(
inventory.resource_relative_url).getTitle())) inventory.resource_relative_url).getTranslatedTitle()))
return resource_list return resource_list
...@@ -103,7 +103,8 @@ class CertificateAuthorityTool(BaseTool): ...@@ -103,7 +103,8 @@ class CertificateAuthorityTool(BaseTool):
Raises CertificateAuthorityBusy""" Raises CertificateAuthorityBusy"""
if os.path.exists(self.lock): if os.path.exists(self.lock):
raise CertificateAuthorityBusy raise CertificateAuthorityBusy
open(self.lock, 'w').write('locked') with open(self.lock, 'w') as f:
f.write('locked')
def _unlockCertificateAuthority(self): def _unlockCertificateAuthority(self):
"""Checks lock and locks Certificate Authority tool""" """Checks lock and locks Certificate Authority tool"""
...@@ -192,7 +193,8 @@ class CertificateAuthorityTool(BaseTool): ...@@ -192,7 +193,8 @@ class CertificateAuthorityTool(BaseTool):
self._checkCertificateAuthority() self._checkCertificateAuthority()
self._lockCertificateAuthority() self._lockCertificateAuthority()
index = open(self.index).read().splitlines() with open(self.index) as f:
index = f.read().splitlines()
valid_line_list = [q for q in index if q.startswith('V') and valid_line_list = [q for q in index if q.startswith('V') and
('CN=%s/' % common_name in q)] ('CN=%s/' % common_name in q)]
if len(valid_line_list) >= 1: if len(valid_line_list) >= 1:
...@@ -201,7 +203,8 @@ class CertificateAuthorityTool(BaseTool): ...@@ -201,7 +203,8 @@ class CertificateAuthorityTool(BaseTool):
'please revoke it before request a new one..' % common_name) 'please revoke it before request a new one..' % common_name)
try: try:
new_id = open(self.serial, 'r').read().strip().lower() with open(self.serial, 'r') as f:
new_id = f.read().strip().lower()
key = os.path.join(self.certificate_authority_path, 'private', key = os.path.join(self.certificate_authority_path, 'private',
new_id+'.key') new_id+'.key')
csr = os.path.join(self.certificate_authority_path, new_id + '.csr') csr = os.path.join(self.certificate_authority_path, new_id + '.csr')
...@@ -216,9 +219,13 @@ class CertificateAuthorityTool(BaseTool): ...@@ -216,9 +219,13 @@ class CertificateAuthorityTool(BaseTool):
'-batch', '-config', self.openssl_config, '-out', cert, '-infiles', '-batch', '-config', self.openssl_config, '-out', cert, '-infiles',
csr]) csr])
os.unlink(csr) os.unlink(csr)
with open(key) as f:
key = f.read()
with open(cert) as f:
cert = f.read()
return dict( return dict(
key=open(key).read(), key=key,
certificate=open(cert).read(), certificate=cert,
id=new_id, id=new_id,
common_name=common_name) common_name=common_name)
except Exception: except Exception:
...@@ -242,7 +249,8 @@ class CertificateAuthorityTool(BaseTool): ...@@ -242,7 +249,8 @@ class CertificateAuthorityTool(BaseTool):
self._checkCertificateAuthority() self._checkCertificateAuthority()
self._lockCertificateAuthority() self._lockCertificateAuthority()
try: try:
new_id = open(self.crl, 'r').read().strip().lower() with open(self.crl, 'r') as f:
new_id = f.read().strip().lower()
crl_path = os.path.join(self.certificate_authority_path, 'crl') crl_path = os.path.join(self.certificate_authority_path, 'crl')
crl = os.path.join(crl_path, new_id + '.crl') crl = os.path.join(crl_path, new_id + '.crl')
cert = os.path.join(self.certificate_authority_path, 'certs', cert = os.path.join(self.certificate_authority_path, 'certs',
...@@ -260,7 +268,9 @@ class CertificateAuthorityTool(BaseTool): ...@@ -260,7 +268,9 @@ class CertificateAuthorityTool(BaseTool):
alias += str(len(glob.glob(alias + '*'))) alias += str(len(glob.glob(alias + '*')))
created.append(alias) created.append(alias)
os.symlink(os.path.basename(crl), alias) os.symlink(os.path.basename(crl), alias)
return dict(crl=open(crl).read()) with open(crl) as f:
crl = f.read()
return dict(crl=crl)
except Exception: except Exception:
e = sys.exc_info() e = sys.exc_info()
try: try:
...@@ -278,7 +288,8 @@ class CertificateAuthorityTool(BaseTool): ...@@ -278,7 +288,8 @@ class CertificateAuthorityTool(BaseTool):
self._unlockCertificateAuthority() self._unlockCertificateAuthority()
def _getValidSerial(self, common_name): def _getValidSerial(self, common_name):
index = open(self.index).read().splitlines() with open(self.index) as f:
index = f.read().splitlines()
valid_line_list = [q for q in index if q.startswith('V') and valid_line_list = [q for q in index if q.startswith('V') and
('CN=%s/' % common_name in q)] ('CN=%s/' % common_name in q)]
if len(valid_line_list) < 1: if len(valid_line_list) < 1:
......
...@@ -347,9 +347,9 @@ class BusinessConfiguration(Item): ...@@ -347,9 +347,9 @@ class BusinessConfiguration(Item):
## we have already created configuration save for this state ## we have already created configuration save for this state
## so remove from it already existing configuration items ## so remove from it already existing configuration items
if configuration_save != self: # don't delete ourselves if configuration_save != self: # don't delete ourselves
existing_conf_items = configuration_save.objectIds() existing_conf_items = list(configuration_save.objectIds())
existing_conf_items = map(None, existing_conf_items) if existing_conf_items:
configuration_save.manage_delObjects(existing_conf_items) configuration_save.manage_delObjects(existing_conf_items)
modified_form_kw = {} modified_form_kw = {}
for k in form_kw.keys(): for k in form_kw.keys():
......
############################################################################## ##############################################################################
# coding: utf-8
# Copyright (c) 2010 Nexedi SA and Contributors. All Rights Reserved. # Copyright (c) 2010 Nexedi SA and Contributors. All Rights Reserved.
# Rafael Monnerat <rafael@nexedi.com> # Rafael Monnerat <rafael@nexedi.com>
# Ivan Tyagov <ivan@nexedi.com> # Ivan Tyagov <ivan@nexedi.com>
......
password_confirm = request.get('field_your_password_confirm', None) password_confirm = request.get('field_your_password_confirm', None)
if editor.encode('ascii', 'ignore') != editor:
return False
return password_confirm == editor return password_confirm == editor
...@@ -348,7 +348,7 @@ def test_suite(): ...@@ -348,7 +348,7 @@ def test_suite():
suite.addTest(unittest.makeSuite(TestTimeZoneContext)) suite.addTest(unittest.makeSuite(TestTimeZoneContext))
suite.addTest(unittest.makeSuite(TestDateTimePatch)) suite.addTest(unittest.makeSuite(TestDateTimePatch))
# also run original tests from DateTime module # also run original tests from DateTime module BBB ZOPE2
# pylint:disable=no-name-in-module # pylint:disable=no-name-in-module
try: try:
import DateTime.tests.testDateTime as test_datetime import DateTime.tests.testDateTime as test_datetime
......
...@@ -4074,7 +4074,8 @@ VALUES ...@@ -4074,7 +4074,8 @@ VALUES
def doSomething(self, message_list): def doSomething(self, message_list):
r = [] r = []
for m in message_list: for m in message_list:
m.result = r.append(m.object.getPath()) r.append(m.object.getPath())
m.result = None
r.sort() r.sort()
group_method_call_list.append(r) group_method_call_list.append(r)
self.portal.portal_activities.__class__.doSomething = doSomething self.portal.portal_activities.__class__.doSomething = doSomething
......
...@@ -281,7 +281,7 @@ class TestIdTool(ERP5TypeTestCase): ...@@ -281,7 +281,7 @@ class TestIdTool(ERP5TypeTestCase):
query = 'select last_id from portal_ids where id_group="foo_bar"' query = 'select last_id from portal_ids where id_group="foo_bar"'
self.assertRaises(ProgrammingError, sql_connection.manage_test, query) self.assertRaises(ProgrammingError, sql_connection.manage_test, query)
generator.rebuildSqlTable() generator.rebuildSqlTable()
result = sql_connection.manage_test(query) result = sql_connection.manage_test(query)
self.assertEqual(result[0].last_id, 4) self.assertEqual(result[0].last_id, 4)
def checkExportImportDict(self, id_generator): def checkExportImportDict(self, id_generator):
......
...@@ -37,7 +37,7 @@ import email ...@@ -37,7 +37,7 @@ import email
from email.header import decode_header, make_header from email.header import decode_header, make_header
from email.utils import parseaddr from email.utils import parseaddr
# Copied from ERP5Type/patches/CMFMailIn.py # Copied from bt5/erp5_egov/TestTemplateItem/testEGovMixin.py
def decode_email(file_): def decode_email(file_):
# Prepare result # Prepare result
theMail = { theMail = {
......
...@@ -15,7 +15,7 @@ import re ...@@ -15,7 +15,7 @@ import re
from Products.PythonScripts.standard import html_quote from Products.PythonScripts.standard import html_quote
blank = "" blank = ""
header_current = 1 header_current = '0'
header_initial = None header_initial = None
table_of_content = blank table_of_content = blank
index = 0 index = 0
......
text = context.asText() text = context.asText()
LENGTH = 25 LENGTH = 25
#TODO: Think about the display length of multibyte characters. # TODO: Think about the display length of multibyte characters.
try: try:
return unicode(text, 'utf-8')[:LENGTH].encode('utf-8') return unicode(text, 'utf-8')[:LENGTH].encode('utf-8')
except UnicodeDecodeError: except UnicodeDecodeError:
......
...@@ -1603,7 +1603,7 @@ class TestCRMMailSend(BaseTestCRM): ...@@ -1603,7 +1603,7 @@ class TestCRMMailSend(BaseTestCRM):
def test_testValidatorForAttachmentField(self): def test_testValidatorForAttachmentField(self):
""" """
If an Event Type doesn't allow Emebedded Files in its sub portal types, If an Event Type doesn't allow Embedded Files in its sub portal types,
then the dialog should tell the user that attachment can't be uploaded then the dialog should tell the user that attachment can't be uploaded
""" """
# Add a document which will be attached. # Add a document which will be attached.
...@@ -1792,7 +1792,7 @@ class TestCRMMailSend(BaseTestCRM): ...@@ -1792,7 +1792,7 @@ class TestCRMMailSend(BaseTestCRM):
def test_cloneEvent(self): def test_cloneEvent(self):
""" """
All events uses after script and interaciton All events uses after script and interaction
workflow add a test for clone workflow add a test for clone
""" """
# XXX in the case of title, getTitle ignores the title attribute, # XXX in the case of title, getTitle ignores the title attribute,
...@@ -1825,7 +1825,7 @@ class TestCRMMailSend(BaseTestCRM): ...@@ -1825,7 +1825,7 @@ class TestCRMMailSend(BaseTestCRM):
def test_cloneTicketAndEventList(self): def test_cloneTicketAndEventList(self):
""" """
All events uses after script and interaciton All events uses after script and interaction
workflow add a test for clone workflow add a test for clone
""" """
portal = self.portal portal = self.portal
......
...@@ -150,12 +150,10 @@ class TestEditorField(ERP5TypeTestCase, ZopeTestCase.Functional): ...@@ -150,12 +150,10 @@ class TestEditorField(ERP5TypeTestCase, ZopeTestCase.Functional):
if html_text.find(match_string1) == -1: if html_text.find(match_string1) == -1:
print(html_text) print(html_text)
print(match_string1) print(match_string1)
import pdb; pdb.set_trace()
return False return False
if html_text.find(match_string2) == -1: if html_text.find(match_string2) == -1:
print(html_text) print(html_text)
print(match_string2) print(match_string2)
import pdb; pdb.set_trace()
return False return False
return True return True
......
...@@ -865,7 +865,7 @@ class TestTemplateTool(ERP5TypeTestCase): ...@@ -865,7 +865,7 @@ class TestTemplateTool(ERP5TypeTestCase):
erp5_test = self.portal.portal_skins['erp5_test'] erp5_test = self.portal.portal_skins['erp5_test']
self.assertTrue(erp5_test.hasObject('test_file')) self.assertTrue(erp5_test.hasObject('test_file'))
def test_ownerhsip(self): def test_ownership(self):
self.assertEqual( self.assertEqual(
self.portal.portal_skins.erp5_core.getOwnerTuple(), self.portal.portal_skins.erp5_core.getOwnerTuple(),
([self.portal.getId(), 'acl_users'], 'System Processes'), ([self.portal.getId(), 'acl_users'], 'System Processes'),
......
...@@ -1725,7 +1725,7 @@ return context.getPortalObject().foo_module.contentValues() ...@@ -1725,7 +1725,7 @@ return context.getPortalObject().foo_module.contentValues()
form_relative_url='portal_skins/erp5_ui_test/FooModule_viewFooList/listbox' form_relative_url='portal_skins/erp5_ui_test/FooModule_viewFooList/listbox'
) )
result_dict = json.loads(result) result_dict = json.loads(result)
#editalble creation date is defined at proxy form # editable creation date is defined at proxy form
# Test the listbox_uid parameter # Test the listbox_uid parameter
self.assertEqual(result_dict['_embedded']['contents'][0]['listbox_uid:list']['key'], 'listbox_uid:list') self.assertEqual(result_dict['_embedded']['contents'][0]['listbox_uid:list']['key'], 'listbox_uid:list')
self.assertEqual(result_dict['_embedded']['contents'][0]['id']['field_gadget_param']['type'], 'StringField') self.assertEqual(result_dict['_embedded']['contents'][0]['id']['field_gadget_param']['type'], 'StringField')
...@@ -3258,10 +3258,10 @@ class TestERP5ODS(ERP5HALJSONStyleSkinsMixin): ...@@ -3258,10 +3258,10 @@ class TestERP5ODS(ERP5HALJSONStyleSkinsMixin):
self.assertEqual(fake_request.RESPONSE.getHeader('Content-Type'), 'text/csv') self.assertEqual(fake_request.RESPONSE.getHeader('Content-Type'), 'text/csv')
else: else:
self.assertEqual(fake_request.RESPONSE.getHeader('Content-Type'), 'text/csv; charset=utf-8') self.assertEqual(fake_request.RESPONSE.getHeader('Content-Type'), 'text/csv; charset=utf-8')
self.assertTrue('foook1' in result, result) self.assertIn('foook1', result)
self.assertTrue('foook2' in result, result) self.assertIn('foook2', result)
self.assertTrue('foonotok' not in result, result) self.assertNotIn('foonotok', result)
# Check one of the field name # Check one of the field name
self.assertTrue('Read-Only Quantity' in result, result) self.assertIn('Read-Only Quantity', result)
# Ensure it is not the list mode rendering # Ensure it is not the list mode rendering
self.assertTrue(len(result.split('\n')) > 50, result) self.assertTrue(len(result.split('\n')) > 50, result)
...@@ -601,11 +601,11 @@ class TestKM(TestKMMixIn): ...@@ -601,11 +601,11 @@ class TestKM(TestKMMixIn):
# add some documents to this web section # add some documents to this web section
presentation = portal.document_module.newContent( presentation = portal.document_module.newContent(
title='My presentation', title='My presentation',
portal_type = 'Presentation', portal_type='Presentation',
reference = 'Presentation-12456_', reference='Presentation-12456_',
version='001', version='001',
language='en', language='en',
publication_section_list = publication_section_category_id_list[:1]) publication_section_list=publication_section_category_id_list[:1])
presentation.publish() presentation.publish()
self.tic() self.tic()
self.changeSkin('KM') self.changeSkin('KM')
...@@ -740,7 +740,7 @@ class TestKM(TestKMMixIn): ...@@ -740,7 +740,7 @@ class TestKM(TestKMMixIn):
portal = self.getPortal() portal = self.getPortal()
portal_gadgets = portal.portal_gadgets portal_gadgets = portal.portal_gadgets
url = '%s/ERP5Site_viewHomeAreaRenderer?gadget_mode=web_front' %self.web_site_url url = '%s/ERP5Site_viewHomeAreaRenderer?gadget_mode=web_front' % self.web_site_url
response = self.publish(url, self.auth) response = self.publish(url, self.auth)
self.assertIn(self.web_front_knowledge_pad.getTitle(), response.getBody()) self.assertIn(self.web_front_knowledge_pad.getTitle(), response.getBody())
......
...@@ -69,13 +69,16 @@ class PALOETLConnection(XMLObject): ...@@ -69,13 +69,16 @@ class PALOETLConnection(XMLObject):
security = ClassSecurityInfo() security = ClassSecurityInfo()
security.declareObjectProtected(Permissions.AccessContentsInformation) security.declareObjectProtected(Permissions.AccessContentsInformation)
_ignore_ssl_certificate_check = True
_fix_service_location = True
def _getSudsClient(self): def _getSudsClient(self):
# maybe client can be cached as a _v_ attribute. For now, we do not care about performance. # maybe client can be cached as a _v_ attribute. For now, we do not care about performance.
if "ignore ssl certificate check": if self._ignore_ssl_certificate_check:
client = suds.client.Client(self.getUrlString(), transport=HTTPAuthenticatedUnverifiedSSL()) client = suds.client.Client(self.getUrlString(), transport=HTTPAuthenticatedUnverifiedSSL())
else: else:
client = suds.client.Client(self.getUrlString()) client = suds.client.Client(self.getUrlString())
if "fix service location": if self._fix_service_location:
# XXX The axis2 generated webservice only supports http on port 8080. # XXX The axis2 generated webservice only supports http on port 8080.
# It seems to be using an old and buggy version of axis2. # It seems to be using an old and buggy version of axis2.
# Easiest workaround is to force the port (in WSDL terminology) location. # Easiest workaround is to force the port (in WSDL terminology) location.
......
...@@ -38,10 +38,10 @@ inventory_param_dict = { ...@@ -38,10 +38,10 @@ inventory_param_dict = {
} }
employee_param_dict = inventory_param_dict.copy() employee_param_dict = inventory_param_dict.copy()
employee_param_dict['contribution_share_uid'] = context.portal_categories.contribution_share.employee.getUid() employee_param_dict['contribution_share_uid'] = portal.portal_categories.contribution_share.employee.getUid()
employer_param_dict = inventory_param_dict.copy() employer_param_dict = inventory_param_dict.copy()
employer_param_dict['contribution_share_uid'] = context.portal_categories.contribution_share.employer.getUid() employer_param_dict['contribution_share_uid'] = portal.portal_categories.contribution_share.employer.getUid()
if request.get('mirror_section'): if request.get('mirror_section'):
mirror_section = request['mirror_section'] mirror_section = request['mirror_section']
......
...@@ -16,7 +16,6 @@ ...@@ -16,7 +16,6 @@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
############################################################################## ##############################################################################
from __future__ import print_function
import os, sys, shutil, tempfile import os, sys, shutil, tempfile
from cStringIO import StringIO from cStringIO import StringIO
from zLOG import LOG,ERROR,INFO,WARNING from zLOG import LOG,ERROR,INFO,WARNING
...@@ -28,7 +27,6 @@ try: ...@@ -28,7 +27,6 @@ try:
except ImportError: # BBB Zope2 except ImportError: # BBB Zope2
from Globals import package_home from Globals import package_home
import PIL.Image as PIL_Image import PIL.Image as PIL_Image
import thread
import random import random
import base64 import base64
from OFS.Folder import Folder from OFS.Folder import Folder
...@@ -176,15 +174,12 @@ class ZoomifyBase: ...@@ -176,15 +174,12 @@ class ZoomifyBase:
lr_y = ul_y + self.tileSize lr_y = ul_y + self.tileSize
else: else:
lr_y = self.originalHeight lr_y = self.originalHeight
print("Going to open image")
imageRow = image.crop([0, ul_y, self.originalWidth, lr_y]) imageRow = image.crop([0, ul_y, self.originalWidth, lr_y])
saveFilename = root + str(tier) + '-' + str(row) + ext saveFilename = root + str(tier) + '-' + str(row) + ext
if imageRow.mode != 'RGB': if imageRow.mode != 'RGB':
imageRow = imageRow.convert('RGB') imageRow = imageRow.convert('RGB')
imageRow.save(os.path.join(tempfile.gettempdir(), saveFilename), imageRow.save(os.path.join(tempfile.gettempdir(), saveFilename),
'JPEG', quality=100) 'JPEG', quality=100)
print("os path exist : %r" % os.path.exists(os.path.join(
tempfile.gettempdir(), saveFilename)))
if os.path.exists(os.path.join(tempfile.gettempdir(), saveFilename)): if os.path.exists(os.path.join(tempfile.gettempdir(), saveFilename)):
self.processRowImage(tier=tier, row=row) self.processRowImage(tier=tier, row=row)
row += 1 row += 1
...@@ -192,7 +187,6 @@ class ZoomifyBase: ...@@ -192,7 +187,6 @@ class ZoomifyBase:
def processRowImage(self, tier=0, row=0): def processRowImage(self, tier=0, row=0):
""" for an image, create and save tiles """ """ for an image, create and save tiles """
print('*** processing tier: ' + str(tier) + ' row: ' + str(row))
tierWidth, tierHeight = self._v_scaleInfo[tier] tierWidth, tierHeight = self._v_scaleInfo[tier]
rowsForTier = tierHeight/self.tileSize rowsForTier = tierHeight/self.tileSize
if tierHeight % self.tileSize > 0: if tierHeight % self.tileSize > 0:
...@@ -335,7 +329,7 @@ class ZoomifyZopeProcessor(ZoomifyBase): ...@@ -335,7 +329,7 @@ class ZoomifyZopeProcessor(ZoomifyBase):
def openImage(self): def openImage(self):
""" load the image data """ """ load the image data """
return PIL_Image.open(self._v_imageObject.name) return PIL_Image.open(self._v_imageObject)
def createDefaultViewer(self): def createDefaultViewer(self):
""" add the default Zoomify viewer to the Zoomify metadata """ """ add the default Zoomify viewer to the Zoomify metadata """
......
#from Products.ERP5.Document.TileImageTransformed import TileImageTransformed
#from cStringIO import StringIO
portal = context.getPortalObject() portal = context.getPortalObject()
data = portal.restrictedTraverse("portal_skins/erp5_safeimage/img/image_test.jpg") data = portal.restrictedTraverse("portal_skins/erp5_safeimage/img/image_test.jpg")
print(data.data) print(data.data)
return printed return printed
...@@ -70,7 +70,6 @@ with ImmediateReindexContextManager() as immediate_reindex_context_manager: ...@@ -70,7 +70,6 @@ with ImmediateReindexContextManager() as immediate_reindex_context_manager:
line_variation_base_category_list = line_variation_base_category_dict.keys() line_variation_base_category_list = line_variation_base_category_dict.keys()
# construct new content (container_line) # construct new content (container_line)
resource_url = resource_url
new_container_line_id = str(container.generateNewId()) new_container_line_id = str(container.generateNewId())
container_line = container.newContent( container_line = container.newContent(
immediate_reindex=immediate_reindex_context_manager, immediate_reindex=immediate_reindex_context_manager,
......
...@@ -2838,11 +2838,11 @@ class TestOrder(TestOrderMixin, ERP5TypeTestCase): ...@@ -2838,11 +2838,11 @@ class TestOrder(TestOrderMixin, ERP5TypeTestCase):
portal_type='Organisation', title='Client', portal_type='Organisation', title='Client',
default_image_file=image) default_image_file=image)
from OFS.Image import Pdata from OFS.Image import Pdata
self.assertTrue(isinstance(client.getDefaultImageValue().data, Pdata)) self.assertIsInstance(client.getDefaultImageValue().data, Pdata)
vendor = self.portal.organisation_module.newContent( vendor = self.portal.organisation_module.newContent(
portal_type='Organisation', title='Vendor', portal_type='Organisation', title='Vendor',
default_image_file=image) default_image_file=image)
self.assertTrue(isinstance(vendor.getDefaultImageValue().data, Pdata)) self.assertIsInstance(vendor.getDefaultImageValue().data, Pdata)
order = self.portal.getDefaultModule(self.order_portal_type).newContent( order = self.portal.getDefaultModule(self.order_portal_type).newContent(
portal_type=self.order_portal_type, portal_type=self.order_portal_type,
specialise=self.business_process, specialise=self.business_process,
......
...@@ -1799,7 +1799,7 @@ class TestPackingList(TestPackingListMixin, ERP5TypeTestCase) : ...@@ -1799,7 +1799,7 @@ class TestPackingList(TestPackingListMixin, ERP5TypeTestCase) :
sale_packing_list2.getUid()))] sale_packing_list2.getUid()))]
self.assertEqual({self.default_quantity-4, self.default_quantity-3}, self.assertEqual({self.default_quantity-4, self.default_quantity-3},
set([x.getQuantity() for x in sale_packing_list1.getMovementList()])) set([x.getQuantity() for x in sale_packing_list1.getMovementList()]))
self.assertEqual({1, 1}, set([x.getQuantity() for x in sale_packing_list3.getMovementList()])) self.assertEqual({1}, set([x.getQuantity() for x in sale_packing_list3.getMovementList()]))
self.assertEqual("solved", sale_packing_list3.getCausalityState()) self.assertEqual("solved", sale_packing_list3.getCausalityState())
self.assertEqual("solved", sale_packing_list1.getCausalityState()) self.assertEqual("solved", sale_packing_list1.getCausalityState())
def getSolverProcessStateList(delivery): def getSolverProcessStateList(delivery):
...@@ -1811,7 +1811,7 @@ class TestPackingList(TestPackingListMixin, ERP5TypeTestCase) : ...@@ -1811,7 +1811,7 @@ class TestPackingList(TestPackingListMixin, ERP5TypeTestCase) :
self.assertEqual({self.default_quantity-4, self.default_quantity-3}, self.assertEqual({self.default_quantity-4, self.default_quantity-3},
set([x.getQuantity() for x in sale_packing_list1.getMovementList()])) set([x.getQuantity() for x in sale_packing_list1.getMovementList()]))
self.assertEqual({1, 2}, set([x.getQuantity() for x in sale_packing_list2.getMovementList()])) self.assertEqual({1, 2}, set([x.getQuantity() for x in sale_packing_list2.getMovementList()]))
self.assertEqual({2, 2}, set([x.getQuantity() for x in sale_packing_list3.getMovementList()])) self.assertEqual({2}, set([x.getQuantity() for x in sale_packing_list3.getMovementList()]))
self.assertEqual("solved", sale_packing_list1.getCausalityState()) self.assertEqual("solved", sale_packing_list1.getCausalityState())
self.assertEqual("solved", sale_packing_list2.getCausalityState()) self.assertEqual("solved", sale_packing_list2.getCausalityState())
self.assertEqual("solved", sale_packing_list3.getCausalityState()) self.assertEqual("solved", sale_packing_list3.getCausalityState())
...@@ -1822,7 +1822,7 @@ class TestPackingList(TestPackingListMixin, ERP5TypeTestCase) : ...@@ -1822,7 +1822,7 @@ class TestPackingList(TestPackingListMixin, ERP5TypeTestCase) :
self.assertEqual({self.default_quantity-5, self.default_quantity-4}, self.assertEqual({self.default_quantity-5, self.default_quantity-4},
set([x.getQuantity() for x in sale_packing_list1.getMovementList()])) set([x.getQuantity() for x in sale_packing_list1.getMovementList()]))
self.assertEqual({2, 3}, set([x.getQuantity() for x in sale_packing_list2.getMovementList()])) self.assertEqual({2, 3}, set([x.getQuantity() for x in sale_packing_list2.getMovementList()]))
self.assertEqual({2, 2}, set([x.getQuantity() for x in sale_packing_list3.getMovementList()])) self.assertEqual({2}, set([x.getQuantity() for x in sale_packing_list3.getMovementList()]))
self.assertEqual("solved", sale_packing_list1.getCausalityState()) self.assertEqual("solved", sale_packing_list1.getCausalityState())
self.assertEqual("solved", sale_packing_list2.getCausalityState()) self.assertEqual("solved", sale_packing_list2.getCausalityState())
self.assertEqual("solved", sale_packing_list3.getCausalityState()) self.assertEqual("solved", sale_packing_list3.getCausalityState())
...@@ -1837,7 +1837,7 @@ class TestPackingList(TestPackingListMixin, ERP5TypeTestCase) : ...@@ -1837,7 +1837,7 @@ class TestPackingList(TestPackingListMixin, ERP5TypeTestCase) :
self.assertEqual({self.default_quantity-6, self.default_quantity-5}, self.assertEqual({self.default_quantity-6, self.default_quantity-5},
set([x.getQuantity() for x in sale_packing_list1.getMovementList()])) set([x.getQuantity() for x in sale_packing_list1.getMovementList()]))
self.assertEqual({2, 3}, set([x.getQuantity() for x in sale_packing_list2.getMovementList()])) self.assertEqual({2, 3}, set([x.getQuantity() for x in sale_packing_list2.getMovementList()]))
self.assertEqual({3, 3}, set([x.getQuantity() for x in sale_packing_list3.getMovementList()])) self.assertEqual({3}, set([x.getQuantity() for x in sale_packing_list3.getMovementList()]))
self.assertEqual("solved", sale_packing_list1.getCausalityState()) self.assertEqual("solved", sale_packing_list1.getCausalityState())
self.assertEqual("solved", sale_packing_list2.getCausalityState()) self.assertEqual("solved", sale_packing_list2.getCausalityState())
self.assertEqual("solved", sale_packing_list3.getCausalityState()) self.assertEqual("solved", sale_packing_list3.getCausalityState())
......
...@@ -1412,6 +1412,7 @@ class TestResource(ERP5TypeTestCase): ...@@ -1412,6 +1412,7 @@ class TestResource(ERP5TypeTestCase):
self.assertEqual(resource.getInternalSupplyLineDestinationReference(), self.assertEqual(resource.getInternalSupplyLineDestinationReference(),
'test_destination_reference_on_internal_supply_line') 'test_destination_reference_on_internal_supply_line')
@expectedFailure
def testQuantityUnitOnMovement(self): def testQuantityUnitOnMovement(self):
"""Make sure that changing default quantity unit on resource does not """Make sure that changing default quantity unit on resource does not
affect to movement. affect to movement.
...@@ -1464,7 +1465,8 @@ class TestResource(ERP5TypeTestCase): ...@@ -1464,7 +1465,8 @@ class TestResource(ERP5TypeTestCase):
# Check existing movement again and make sure that quantity # Check existing movement again and make sure that quantity
# unit is not changed. # unit is not changed.
expectedFailure(self.assertEqual)( # XXX This is the expectedFailure
self.assertEqual(
sale_order_line.getQuantityUnitValue(), sale_order_line.getQuantityUnitValue(),
self.quantity_unit_gram) self.quantity_unit_gram)
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/bar_module/FooModule_createObjects?num:int=1;portal_type=Bar</td> <td>${base_url}/bar_module/FooModule_createObjects?num:int=1&amp;portal_type=Bar</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/bar_module/FooModule_createObjects?num:int=1;portal_type=Bar</td> <td>${base_url}/bar_module/FooModule_createObjects?num:int=1&amp;portal_type=Bar</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/bar_module/FooModule_createObjects?num:int=1;portal_type=Bar</td> <td>${base_url}/bar_module/FooModule_createObjects?num:int=1&amp;portal_type=Bar</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/bar_module/FooModule_createObjects?num:int=1;portal_type=Bar</td> <td>${base_url}/bar_module/FooModule_createObjects?num:int=1&amp;portal_type=Bar</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/bar_module/FooModule_createObjects?num:int=1;portal_type=Bar</td> <td>${base_url}/bar_module/FooModule_createObjects?num:int=1&amp;portal_type=Bar</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/bar_module/FooModule_createObjects?num:int=1;portal_type=Bar</td> <td>${base_url}/bar_module/FooModule_createObjects?num:int=1&amp;portal_type=Bar</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/bar_module/FooModule_createObjects?num:int=1;portal_type=Bar</td> <td>${base_url}/bar_module/FooModule_createObjects?num:int=1&amp;portal_type=Bar</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -58,7 +58,7 @@ ...@@ -58,7 +58,7 @@
</tr> </tr>
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/bar_module/FooModule_createObjects?start:int=3;num:int=7;portal_type=Bar</td> <td>${base_url}/bar_module/FooModule_createObjects?start:int=3&amp;num:int=7&amp;portal_type=Bar</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</tr> </tr>
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_domain_tree=checked;field_domain_root_list=foo_category/foo_big_category%7CFoo%20and%20Big%20Category</td> <td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_domain_tree=checked&amp;field_domain_root_list=foo_category/foo_big_category%7CFoo%20and%20Big%20Category</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<!-- XXX bug compatibility; all columns must be set explicitly --> <!-- XXX bug compatibility; all columns must be set explicitly -->
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_all_columns=id%7CID%0Atitle%7CTitle%0Adelivery.quantity%7CQuantity;field_stat_method=portal_catalog</td> <td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_all_columns=id%7CID%0Atitle%7CTitle%0Adelivery.quantity%7CQuantity&amp;field_stat_method=portal_catalog</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
<!-- XXX bug compatibility; all_columns are used for sortable columns. --> <!-- XXX bug compatibility; all_columns are used for sortable columns. -->
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_sort_columns=id%0Atitle;field_all_columns=id%0Atitle</td> <td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_sort_columns=id%0Atitle&amp;field_all_columns=id%0Atitle</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</tr> </tr>
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_domain_tree=checked;field_domain_root_list=foo_category%7CFoo%20Category</td> <td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_domain_tree=checked&amp;field_domain_root_list=foo_category%7CFoo%20Category</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
...@@ -153,7 +153,7 @@ ...@@ -153,7 +153,7 @@
<!-- Click on report tree --> <!-- Click on report tree -->
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_report_tree=checked;field_report_root_list=foo_category%7CFoo%20Category%0Afoo_empty_category%7CFoo%20Empty%20Category</td> <td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_report_tree=checked&amp;field_report_root_list=foo_category%7CFoo%20Category%0Afoo_empty_category%7CFoo%20Empty%20Category</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</tr> </tr>
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_domain_tree=checked;field_domain_root_list=foo_category%7CFoo%20Category</td> <td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_domain_tree=checked&amp;field_domain_root_list=foo_category%7CFoo%20Category</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</tr> </tr>
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_domain_tree=checked;field_domain_root_list=parent_domain%7CParent</td> <td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_domain_tree=checked&amp;field_domain_root_list=parent_domain%7CParent</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</tr> </tr>
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_domain_tree=checked;field_domain_root_list=foo_domain%7CFoo%20Domain</td> <td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_domain_tree=checked&amp;field_domain_root_list=foo_domain%7CFoo%20Domain</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
</tr> </tr>
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_report_tree=checked;field_report_root_list=foo_domain%7CFoo%20Domain</td> <td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_report_tree=checked&amp;field_report_root_list=foo_domain%7CFoo%20Domain</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/init" /> <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/init" />
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_meta_types=ERP5%20Delivery;field_portal_types=</td> <td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_meta_types=ERP5%20Delivery&amp;field_portal_types=</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
...@@ -157,7 +157,7 @@ ...@@ -157,7 +157,7 @@
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_meta_types=ERP5%20Toto;field_portal_types=</td> <td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_meta_types=ERP5%20Toto&amp;field_portal_types=</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/init" /> <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/init" />
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_meta_types=;field_portal_types=Foo</td> <td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_meta_types=&amp;field_portal_types=Foo</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
...@@ -154,7 +154,7 @@ ...@@ -154,7 +154,7 @@
</tal:block> </tal:block>
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_meta_types=;field_portal_types=Toto</td> <td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_meta_types=&amp;field_portal_types=Toto</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -322,7 +322,7 @@ ...@@ -322,7 +322,7 @@
Don't forget to update the code below if listbox_zuite/testDomainTree change. --> Don't forget to update the code below if listbox_zuite/testDomainTree change. -->
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/foo_module/0/Foo_viewRelationField/listbox/ListBox_setPropertyList?field_domain_tree=checked;field_domain_root_list=foo_category%7CFoo%20Category</td> <td>${base_url}/foo_module/0/Foo_viewRelationField/listbox/ListBox_setPropertyList?field_domain_tree=checked&amp;field_domain_root_list=foo_category%7CFoo%20Category</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</tr> </tr>
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_report_tree=checked;field_report_root_list=foo_category%7CFoo%20Category%0Afoo_empty_category%7CFoo%20Empty%20Category</td> <td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_report_tree=checked&amp;field_report_root_list=foo_category%7CFoo%20Category%0Afoo_empty_category%7CFoo%20Empty%20Category</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</tr> </tr>
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_stat_method=portal_catalog;field_report_tree=checked;field_report_root_list=foo_domain%7CFoo%20Domain</td> <td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_stat_method=portal_catalog&amp;field_report_tree=checked&amp;field_report_root_list=foo_domain%7CFoo%20Domain</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</tr> </tr>
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_stat_columns=id%7CFooModule_statId%0Atitle%7CFooModule_statTitle;field_stat_method=portal_catalog</td> <td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_stat_columns=id%7CFooModule_statId%0Atitle%7CFooModule_statTitle&amp;field_stat_method=portal_catalog</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
</tr> </tr>
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_domain_tree=checked;field_domain_root_list=foo_category%7CFoo%20Category</td> <td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_domain_tree=checked&amp;field_domain_root_list=foo_category%7CFoo%20Category</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -187,7 +187,7 @@ ...@@ -187,7 +187,7 @@
</tr> </tr>
<tr> <tr>
<td>clickAndWait</td> <td>clickAndWait</td>
<td tal:content="python: '//div[@id=\'group_lane_%s\']//a' % (str((DateTime().day()/3)+1)) " ></td> <td tal:content="python: '//div[@id=\'group_lane_%s\']//a' % (str((DateTime().day() // 3) + 1)) " ></td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
...@@ -202,7 +202,7 @@ ...@@ -202,7 +202,7 @@
</tr> </tr>
<tr> <tr>
<td>clickAndWait</td> <td>clickAndWait</td>
<td tal:content="python: '//div[@id=\'group_lane_%s\']//a' % (str(DateTime().dow()+1)) " ></td> <td tal:content="python: '//div[@id=\'group_lane_%s\']//a' % (str(DateTime().dow() + 1)) " ></td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -211,7 +211,7 @@ ...@@ -211,7 +211,7 @@
</tr> </tr>
<tr> <tr>
<td>clickAndWait</td> <td>clickAndWait</td>
<td tal:content="python: '//div[@id=\'group_lane_%s\']//a' % (str(DateTime().dow()+1)) " ></td> <td tal:content="python: '//div[@id=\'group_lane_%s\']//a' % (str(DateTime().dow() + 1))"></td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
<tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/init" /> <tal:block metal:use-macro="here/ListBoxZuite_CommonTemplate/macros/init" />
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/bar_module/FooModule_createObjects?num:int=1;portal_type=Bar</td> <td>${base_url}/bar_module/FooModule_createObjects?num:int=1&amp;portal_type=Bar</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
</tr> </tr>
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/bar_module/FooModule_createObjects?num:int=3;portal_type=Bar</td> <td>${base_url}/bar_module/FooModule_createObjects?num:int=3&amp;portal_type=Bar</td>
<td></td> <td></td>
</tr> </tr>
<tr> <tr>
......
...@@ -9,7 +9,7 @@ wtool = getToolByName(context, 'portal_workflow') ...@@ -9,7 +9,7 @@ wtool = getToolByName(context, 'portal_workflow')
result = 'OK' result = 'OK'
error_list = [] error_list = []
def assertEquals(a, b, msg=''): def assertEqual(a, b, msg=''):
if a != b: if a != b:
if msg: if msg:
error_list.append(msg) error_list.append(msg)
...@@ -17,25 +17,25 @@ def assertEquals(a, b, msg=''): ...@@ -17,25 +17,25 @@ def assertEquals(a, b, msg=''):
error_list.append('%r != %r' % (a, b)) error_list.append('%r != %r' % (a, b))
foo_2 = foo_module['2'] foo_2 = foo_module['2']
assertEquals(foo_2.getSimulationState(), 'validated', assertEqual(foo_2.getSimulationState(), 'validated',
'Foo 2 state is %s' % foo_2.getSimulationState()) 'Foo 2 state is %s' % foo_2.getSimulationState())
if not error_list: if not error_list:
assertEquals( assertEqual(
wtool.getInfoFor(foo_2, 'history', wf_id='foo_workflow')[-2]['comment'], wtool.getInfoFor(foo_2, 'history', wf_id='foo_workflow')[-2]['comment'],
'Comment !') 'Comment !')
assertEquals( assertEqual(
wtool.getInfoFor(foo_2, 'history', wf_id='foo_workflow')[-2]['custom_workflow_variable'], wtool.getInfoFor(foo_2, 'history', wf_id='foo_workflow')[-2]['custom_workflow_variable'],
'Custom Workflow Variable') 'Custom Workflow Variable')
foo_3 = foo_module['3'] foo_3 = foo_module['3']
assertEquals(foo_3.getSimulationState(), 'validated', assertEqual(foo_3.getSimulationState(), 'validated',
'Foo 3 state is %s' % foo_3.getSimulationState()) 'Foo 3 state is %s' % foo_3.getSimulationState())
if not error_list: if not error_list:
assertEquals( assertEqual(
wtool.getInfoFor(foo_3, 'history', wf_id='foo_workflow')[-2]['comment'], wtool.getInfoFor(foo_3, 'history', wf_id='foo_workflow')[-2]['comment'],
'Comment !') 'Comment !')
assertEquals( assertEqual(
wtool.getInfoFor(foo_2, 'history', wf_id='foo_workflow')[-2]['custom_workflow_variable'], wtool.getInfoFor(foo_2, 'history', wf_id='foo_workflow')[-2]['custom_workflow_variable'],
'Custom Workflow Variable') 'Custom Workflow Variable')
......
...@@ -9,7 +9,7 @@ wtool = getToolByName(context, 'portal_workflow') ...@@ -9,7 +9,7 @@ wtool = getToolByName(context, 'portal_workflow')
result = 'OK' result = 'OK'
error_list = [] error_list = []
def assertEquals(a, b, msg=''): def assertEqual(a, b, msg=''):
if a != b: if a != b:
if msg: if msg:
error_list.append(msg) error_list.append(msg)
...@@ -17,18 +17,18 @@ def assertEquals(a, b, msg=''): ...@@ -17,18 +17,18 @@ def assertEquals(a, b, msg=''):
error_list.append('%r != %r' % (a, b)) error_list.append('%r != %r' % (a, b))
foo_2 = foo_module['2'] foo_2 = foo_module['2']
assertEquals(foo_2.getSimulationState(), 'validated', assertEqual(foo_2.getSimulationState(), 'validated',
'Foo 2 state is %s' % foo_2.getSimulationState()) 'Foo 2 state is %s' % foo_2.getSimulationState())
if not error_list: if not error_list:
assertEquals( assertEqual(
wtool.getInfoFor(foo_2, 'history', wf_id='foo_workflow')[-2]['comment'], wtool.getInfoFor(foo_2, 'history', wf_id='foo_workflow')[-2]['comment'],
'Comment !') 'Comment !')
foo_3 = foo_module['3'] foo_3 = foo_module['3']
assertEquals(foo_3.getSimulationState(), 'validated', assertEqual(foo_3.getSimulationState(), 'validated',
'Foo 3 state is %s' % foo_3.getSimulationState()) 'Foo 3 state is %s' % foo_3.getSimulationState())
if not error_list: if not error_list:
assertEquals( assertEqual(
wtool.getInfoFor(foo_3, 'history', wf_id='foo_workflow')[-2]['comment'], wtool.getInfoFor(foo_3, 'history', wf_id='foo_workflow')[-2]['comment'],
'Comment !') 'Comment !')
......
...@@ -10,7 +10,7 @@ wtool = getToolByName(context, 'portal_workflow') ...@@ -10,7 +10,7 @@ wtool = getToolByName(context, 'portal_workflow')
result = 'OK' result = 'OK'
error_list = [] error_list = []
def assertEquals(a, b, msg=''): def assertEqual(a, b, msg=''):
if a != b: if a != b:
if msg: if msg:
error_list.append(msg) error_list.append(msg)
...@@ -18,15 +18,15 @@ def assertEquals(a, b, msg=''): ...@@ -18,15 +18,15 @@ def assertEquals(a, b, msg=''):
error_list.append('%r != %r' % (a, b)) error_list.append('%r != %r' % (a, b))
foo_2 = foo_module['2'] foo_2 = foo_module['2']
assertEquals(foo_2.getSimulationState(), 'draft', assertEqual(foo_2.getSimulationState(), 'draft',
'Foo 2 state is %s' % foo_2.getSimulationState()) 'Foo 2 state is %s' % foo_2.getSimulationState())
foo_3 = foo_module['3'] foo_3 = foo_module['3']
assertEquals(foo_3.getSimulationState(), 'validated', assertEqual(foo_3.getSimulationState(), 'validated',
'Foo 3 state is %s' % foo_3.getSimulationState()) 'Foo 3 state is %s' % foo_3.getSimulationState())
if not error_list: if not error_list:
assertEquals( assertEqual(
wtool.getInfoFor(foo_3, 'history', wf_id='foo_workflow')[-2]['comment'], wtool.getInfoFor(foo_3, 'history', wf_id='foo_workflow')[-2]['comment'],
'Comment !') 'Comment !')
......
...@@ -15,7 +15,7 @@ portal = context.getPortalObject() ...@@ -15,7 +15,7 @@ portal = context.getPortalObject()
default_language = web_section.getLayoutProperty("default_available_language", default='en') default_language = web_section.getLayoutProperty("default_available_language", default='en')
website_url_set = {} website_url_set = {}
#simplify code of Base_doLanguage, can't ues Base_doLanguage directly # simplify code of Base_doLanguage, can't use Base_doLanguage directly
root_website_url = web_section.getOriginalDocument().absolute_url() root_website_url = web_section.getOriginalDocument().absolute_url()
website_url_pattern = r'^%s(?:%s)*(/|$)' % ( website_url_pattern = r'^%s(?:%s)*(/|$)' % (
re.escape(root_website_url), re.escape(root_website_url),
......
...@@ -48,7 +48,7 @@ ...@@ -48,7 +48,7 @@
<tr> <tr>
<td>open</td> <td>open</td>
<td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_columns=modification_date%7CModification%20Date;field_editable=checked</td> <td>${base_url}/foo_module/FooModule_viewFooList/listbox/ListBox_setPropertyList?field_columns=modification_date%7CModification%20Date&amp;field_editable=checked</td>
<td></td> <td></td>
</tr> </tr>
......
...@@ -45,7 +45,6 @@ class ShaDirMixin(object): ...@@ -45,7 +45,6 @@ class ShaDirMixin(object):
Initialize the ERP5 site. Initialize the ERP5 site.
""" """
self.login() self.login()
self.portal = self.getPortal()
self.key = 'mykey' + str(random.random()) self.key = 'mykey' + str(random.random())
self.file_content = 'This is the content.' self.file_content = 'This is the content.'
......
...@@ -366,8 +366,7 @@ class TextDocument(CachedConvertableMixin, BaseConvertableFileMixin, TextContent ...@@ -366,8 +366,7 @@ class TextDocument(CachedConvertableMixin, BaseConvertableFileMixin, TextContent
security.declareProtected(Permissions.AccessContentsInformation, 'getTextContent') security.declareProtected(Permissions.AccessContentsInformation, 'getTextContent')
def getTextContent(self, default=_MARKER): def getTextContent(self, default=_MARKER):
"""Overriden method to check """Overridden method to check permission to access content in raw format
permission to access content in raw format
""" """
self._checkConversionFormatPermission(None) self._checkConversionFormatPermission(None)
if default is _MARKER: if default is _MARKER:
......
...@@ -186,4 +186,5 @@ class BusinessTemplateInfoDir(BusinessTemplateInfoBase): ...@@ -186,4 +186,5 @@ class BusinessTemplateInfoDir(BusinessTemplateInfoBase):
return fileinfo return fileinfo
def readFileInfo(self, fileinfo): def readFileInfo(self, fileinfo):
return open(fileinfo).read() with open(fileinfo) as f:
return f.read()
...@@ -32,7 +32,6 @@ ...@@ -32,7 +32,6 @@
from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase from Products.ERP5Type.tests.ERP5TypeTestCase import ERP5TypeTestCase
from AccessControl.SecurityManagement import newSecurityManager from AccessControl.SecurityManagement import newSecurityManager
from six import StringIO
class TestFormPrintoutMixin(ERP5TypeTestCase): class TestFormPrintoutMixin(ERP5TypeTestCase):
run_all_test = 1 run_all_test = 1
......
...@@ -792,10 +792,10 @@ class TestIngestion(IngestionTestCase): ...@@ -792,10 +792,10 @@ class TestIngestion(IngestionTestCase):
document.edit(file=f) document.edit(file=f)
mime, text = document.convert('text') mime, text = document.convert('text')
self.assertIn('magic', text) self.assertIn('magic', text)
self.assertTrue(mime == 'text/plain') self.assertEqual(mime, 'text/plain')
mime, html = document.convert('html') mime, html = document.convert('html')
self.assertIn('magic', html) self.assertIn('magic', html)
self.assertTrue(mime == 'text/html') self.assertEqual(mime, 'text/html')
def stepExportImage(self, sequence=None, sequence_list=None, **kw): def stepExportImage(self, sequence=None, sequence_list=None, **kw):
""" """
......
...@@ -130,7 +130,7 @@ def patch_linecache(): ...@@ -130,7 +130,7 @@ def patch_linecache():
properly without requiring to create a temporary file on the filesystem properly without requiring to create a temporary file on the filesystem
The filename is is always '<portal_components/*>' for ZODB Components, The filename is is always '<portal_components/*>' for ZODB Components,
'(FILENAME)?Script \(Python\)' for Zope Python Scripts and 'Python '(FILENAME)?Script \\(Python\\)' for Zope Python Scripts and 'Python
Expression "CODE"' for TALES expressions. Expression "CODE"' for TALES expressions.
linecache.cache filled by linecache.updatecache() called by the original linecache.cache filled by linecache.updatecache() called by the original
......
...@@ -9,7 +9,6 @@ __version__ = '0.3.0' ...@@ -9,7 +9,6 @@ __version__ = '0.3.0'
import base64 import base64
import errno import errno
import httplib
import os import os
import random import random
import re import re
...@@ -18,7 +17,6 @@ import string ...@@ -18,7 +17,6 @@ import string
import sys import sys
import time import time
import traceback import traceback
import urllib
import ConfigParser import ConfigParser
from contextlib import contextmanager from contextlib import contextmanager
from io import BytesIO from io import BytesIO
...@@ -32,7 +30,6 @@ from DateTime import DateTime ...@@ -32,7 +30,6 @@ from DateTime import DateTime
import mock import mock
import Products.ZMySQLDA.DA import Products.ZMySQLDA.DA
from Products.ZMySQLDA.DA import Connection as ZMySQLDA_Connection from Products.ZMySQLDA.DA import Connection as ZMySQLDA_Connection
from zope.globalrequest import clearRequest
from zope.globalrequest import getRequest from zope.globalrequest import getRequest
from zope.globalrequest import setRequest from zope.globalrequest import setRequest
import six import six
...@@ -171,7 +168,8 @@ def _createTestPromiseConfigurationFile(promise_path, bt5_repository_path_list=N ...@@ -171,7 +168,8 @@ def _createTestPromiseConfigurationFile(promise_path, bt5_repository_path_list=N
promise_config.set('portal_certificate_authority', 'certificate_authority_path', promise_config.set('portal_certificate_authority', 'certificate_authority_path',
os.environ['TEST_CA_PATH']) os.environ['TEST_CA_PATH'])
promise_config.write(open(promise_path, 'w')) with open(promise_path, 'w') as f:
promise_config.write(f)
def profile_if_environ(environment_var_name): def profile_if_environ(environment_var_name):
if int(os.environ.get(environment_var_name, 0)): if int(os.environ.get(environment_var_name, 0)):
......
...@@ -34,7 +34,8 @@ class commandtransform: ...@@ -34,7 +34,8 @@ class commandtransform:
os.mkdir(tmpdir) os.mkdir(tmpdir)
filename = kwargs.get("filename", '') filename = kwargs.get("filename", '')
fullname = join(tmpdir, basename(filename)) fullname = join(tmpdir, basename(filename))
filedest = open(fullname , "wb").write(data) with open(fullname , "wb") as f:
f.write(data)
return tmpdir, fullname return tmpdir, fullname
def subObjects(self, tmpdir): def subObjects(self, tmpdir):
...@@ -50,7 +51,8 @@ class commandtransform: ...@@ -50,7 +51,8 @@ class commandtransform:
def fixImages(self, path, images, objects): def fixImages(self, path, images, objects):
for image in images: for image in images:
objects[image] = open(join(path, image), 'rb').read() with open(join(path, image), 'rb') as f:
objects[image] = f.read()
def cleanDir(self, tmpdir): def cleanDir(self, tmpdir):
shutil.rmtree(tmpdir) shutil.rmtree(tmpdir)
...@@ -151,7 +153,7 @@ class subprocesstransform: ...@@ -151,7 +153,7 @@ class subprocesstransform:
try: try:
if not self.useStdin: if not self.useStdin:
stdin_file = tempfile.NamedTemporaryFile() stdin_file = tempfile.NamedTemporaryFile()
stdin_file.write( data) stdin_file.write(data)
stdin_file.seek(0) stdin_file.seek(0)
command = command % {'infile': stdin_file.name} # apply tmp name to command command = command % {'infile': stdin_file.name} # apply tmp name to command
data = None data = None
......
...@@ -21,7 +21,6 @@ from __future__ import print_function ...@@ -21,7 +21,6 @@ from __future__ import print_function
import BaseHTTPServer import BaseHTTPServer
import CGIHTTPServer import CGIHTTPServer
import time import time
import httplib
import sys import sys
PORT = 8000 PORT = 8000
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment