Skip to content

erp5
erp5
Commit d5f0b003 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki Committed by Jérome Perrin
Browse files
Options

py2/py3: modernize -f print. 

(not yet for scripts under portal_skins)
parent c0c8b1d7
Hide whitespace changes
Inline Side-by-side
Showing with 99 additions and 83 deletions
bt5/erp5_big_file/ModuleComponentTemplateItem/portal_components/module.erp5.BTreeData.py
View file @ d5f0b003
from __future__ import print_function
from BTrees.LOBTree import LOBTree from BTrees.LOBTree import LOBTree
from persistent import Persistent from persistent import Persistent
import itertools import itertools
...@@ -315,7 +316,7 @@ class BTreeData(Persistent): ...@@ -315,7 +316,7 @@ class BTreeData(Persistent):
if __name__ == '__main__': if __name__ == '__main__':
def check(tree, length, read_offset, read_length, data_, keys=None): def check(tree, length, read_offset, read_length, data_, keys=None):
print list(tree._tree.items()) print(list(tree._tree.items()))
tree_length = len(tree) tree_length = len(tree)
tree_data = tree.read(read_offset, read_length) tree_data = tree.read(read_offset, read_length)
tree_iterator_data = ''.join(tree.iterate(read_offset, read_length)) tree_iterator_data = ''.join(tree.iterate(read_offset, read_length))
......
bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testCache.py
View file @ d5f0b003
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
# #
############################################################################## ##############################################################################
from __future__ import print_function
import random import random
import time import time
...@@ -69,7 +70,7 @@ class TestRamCache(ERP5TypeTestCase): ...@@ -69,7 +70,7 @@ class TestRamCache(ERP5TypeTestCase):
for cache_plugin in filtered_cache_plugins: for cache_plugin in filtered_cache_plugins:
if not self.quiet: if not self.quiet:
print "TESTING (scope): ", cache_plugin print("TESTING (scope): ", cache_plugin)
## clear cache for this plugin ## clear cache for this plugin
cache_plugin.clearCache() cache_plugin.clearCache()
...@@ -85,7 +86,7 @@ class TestRamCache(ERP5TypeTestCase): ...@@ -85,7 +86,7 @@ class TestRamCache(ERP5TypeTestCase):
## we set ONLY one value per scope -> check if we get the same cache_id ## we set ONLY one value per scope -> check if we get the same cache_id
self.assertEqual([cache_id], cache_plugin.getScopeKeyList(scope)) self.assertEqual([cache_id], cache_plugin.getScopeKeyList(scope))
if not self.quiet: if not self.quiet:
print "\t", cache_id, scope, "\t\tOK" print("\t", cache_id, scope, "\t\tOK")
## get list of scopes which must be the same as test_scopes since we clear cache initially ## get list of scopes which must be the same as test_scopes since we clear cache initially
scopes_from_cache = cache_plugin.getScopeList() scopes_from_cache = cache_plugin.getScopeList()
...@@ -118,7 +119,7 @@ class TestRamCache(ERP5TypeTestCase): ...@@ -118,7 +119,7 @@ class TestRamCache(ERP5TypeTestCase):
def generalExpire(self, cache_plugin, iterations): def generalExpire(self, cache_plugin, iterations):
if not self.quiet: if not self.quiet:
print "TESTING (expire): ", cache_plugin print("TESTING (expire): ", cache_plugin)
base_timeout = 1 base_timeout = 1
values = self.prepareValues(iterations) values = self.prepareValues(iterations)
scope = "peter" scope = "peter"
...@@ -128,7 +129,7 @@ class TestRamCache(ERP5TypeTestCase): ...@@ -128,7 +129,7 @@ class TestRamCache(ERP5TypeTestCase):
cache_timeout = base_timeout + random.random()*2 cache_timeout = base_timeout + random.random()*2
cache_id = "mycache_id_to_expire_%s" %(count) cache_id = "mycache_id_to_expire_%s" %(count)
if not self.quiet: if not self.quiet:
print "\t", cache_id, " ==> timeout (s) = ", cache_timeout, print("\t", cache_id, " ==> timeout (s) = ", cache_timeout, end=' ')
## set to cache ## set to cache
cache_plugin.set(cache_id, scope, value, cache_timeout) cache_plugin.set(cache_id, scope, value, cache_timeout)
...@@ -142,11 +143,11 @@ class TestRamCache(ERP5TypeTestCase): ...@@ -142,11 +143,11 @@ class TestRamCache(ERP5TypeTestCase):
## check it, we MUST NOT have this key any more in cache ## check it, we MUST NOT have this key any more in cache
self.assertEqual(False, cache_plugin.has_key(cache_id, scope)) self.assertEqual(False, cache_plugin.has_key(cache_id, scope))
if not self.quiet: if not self.quiet:
print "\t\tOK" print("\t\tOK")
def generaltestSetGet(self, cache_plugin, iterations): def generaltestSetGet(self, cache_plugin, iterations):
if not self.quiet: if not self.quiet:
print "TESTING (set/get/has/del): ", cache_plugin print("TESTING (set/get/has/del): ", cache_plugin)
values = self.prepareValues(iterations) values = self.prepareValues(iterations)
cache_duration = 30 cache_duration = 30
scope = "peter" scope = "peter"
...@@ -158,7 +159,7 @@ class TestRamCache(ERP5TypeTestCase): ...@@ -158,7 +159,7 @@ class TestRamCache(ERP5TypeTestCase):
## set to cache ## set to cache
cache_plugin.set(cache_id, scope, value, cache_duration) cache_plugin.set(cache_id, scope, value, cache_duration)
if not self.quiet: if not self.quiet:
print "\t", cache_id, print("\t", cache_id, end=' ')
## check has_key() ## check has_key()
self.assertEqual(True, cache_plugin.has_key(cache_id, scope)) self.assertEqual(True, cache_plugin.has_key(cache_id, scope))
...@@ -184,7 +185,7 @@ class TestRamCache(ERP5TypeTestCase): ...@@ -184,7 +185,7 @@ class TestRamCache(ERP5TypeTestCase):
self.assertEqual(False, cache_plugin.has_key(cache_id, scope)) self.assertEqual(False, cache_plugin.has_key(cache_id, scope))
if not self.quiet: if not self.quiet:
print "\t\tOK" print("\t\tOK")
def prepareValues(self, iterations): def prepareValues(self, iterations):
""" generate a big list of values """ """ generate a big list of values """
......
bt5/erp5_core_test/TestTemplateItem/portal_components/test.erp5.testCacheTool.py
View file @ d5f0b003
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
# #
############################################################################## ##############################################################################
from __future__ import print_function
import time import time
import unittest import unittest
...@@ -227,9 +228,9 @@ return result ...@@ -227,9 +228,9 @@ return result
def _cacheFactoryInstanceTest(self, my_cache, cf_name, clear_allowed): def _cacheFactoryInstanceTest(self, my_cache, cf_name, clear_allowed):
portal = self.portal portal = self.portal
print print()
print "="*40 print("="*40)
print "TESTING:", cf_name print("TESTING:", cf_name)
result = 'a short value' result = 'a short value'
#portal.portal_caches.clearCacheFactory(cf_name) #portal.portal_caches.clearCacheFactory(cf_name)
...@@ -249,12 +250,12 @@ return result ...@@ -249,12 +250,12 @@ return result
result=result) result=result)
## 1st call ## 1st call
calculation_time = callCache(real_calculation=True) calculation_time = callCache(real_calculation=True)
print "\n\tCalculation time (1st call)", calculation_time print("\n\tCalculation time (1st call)", calculation_time)
self.commit() self.commit()
## 2nd call - should be cached now ## 2nd call - should be cached now
calculation_time = callCache(real_calculation=False) calculation_time = callCache(real_calculation=False)
print "\n\tCalculation time (2nd call)", calculation_time print("\n\tCalculation time (2nd call)", calculation_time)
self.commit() self.commit()
## OK so far let's clear cache ## OK so far let's clear cache
...@@ -263,10 +264,10 @@ return result ...@@ -263,10 +264,10 @@ return result
## 1st call ## 1st call
calculation_time = callCache(real_calculation=True) calculation_time = callCache(real_calculation=True)
print "\n\tCalculation time (after cache clear)", calculation_time print("\n\tCalculation time (after cache clear)", calculation_time)
# Test delete method on CachingMethod # Test delete method on CachingMethod
print "\n\tCalculation time (3rd call)", calculation_time print("\n\tCalculation time (3rd call)", calculation_time)
# make sure cache id filled # make sure cache id filled
calculation_time = callCache(real_calculation=False) calculation_time = callCache(real_calculation=False)
...@@ -275,7 +276,7 @@ return result ...@@ -275,7 +276,7 @@ return result
# Check that result is computed # Check that result is computed
calculation_time = callCache(real_calculation=True) calculation_time = callCache(real_calculation=True)
print "\n\tCalculation time (4th call)", calculation_time print("\n\tCalculation time (4th call)", calculation_time)
self.commit() self.commit()
def test_03_cachePersistentObjects(self): def test_03_cachePersistentObjects(self):
...@@ -296,9 +297,9 @@ return result ...@@ -296,9 +297,9 @@ return result
def test_04_CheckConcurrentRamCacheDict(self): def test_04_CheckConcurrentRamCacheDict(self):
"""Check that all RamCache doesn't clear the same cache_dict """Check that all RamCache doesn't clear the same cache_dict
""" """
print print()
print "="*40 print("="*40)
print "TESTING: Concurrent RamCache" print("TESTING: Concurrent RamCache")
portal = self.portal portal = self.portal
result = 'Something short' result = 'Something short'
...@@ -317,7 +318,7 @@ return result ...@@ -317,7 +318,7 @@ return result
result=result) result=result)
end = time.time() end = time.time()
calculation_time = end-start calculation_time = end-start
print "\n\tCalculation time (1st call)", calculation_time print("\n\tCalculation time (1st call)", calculation_time)
self.assertEqual(cached, result) self.assertEqual(cached, result)
self.commit() self.commit()
...@@ -328,7 +329,7 @@ return result ...@@ -328,7 +329,7 @@ return result
result=result) result=result)
end = time.time() end = time.time()
calculation_time = end-start calculation_time = end-start
print "\n\tCalculation time (2nd call)", calculation_time print("\n\tCalculation time (2nd call)", calculation_time)
self.assertTrue(1.0 > calculation_time, "1.0 <= %s" % calculation_time) self.assertTrue(1.0 > calculation_time, "1.0 <= %s" % calculation_time)
self.assertEqual(cached, result) self.assertEqual(cached, result)
self.commit() self.commit()
...@@ -342,7 +343,7 @@ return result ...@@ -342,7 +343,7 @@ return result
result=result) result=result)
end = time.time() end = time.time()
calculation_time = end-start calculation_time = end-start
print "\n\tCalculation time (3rd call)", calculation_time print("\n\tCalculation time (3rd call)", calculation_time)
self.assertTrue(1.0 > calculation_time, "1.0 <= %s" % calculation_time) self.assertTrue(1.0 > calculation_time, "1.0 <= %s" % calculation_time)
self.assertEqual(cached, result) self.assertEqual(cached, result)
self.commit() self.commit()
...@@ -351,9 +352,9 @@ return result ...@@ -351,9 +352,9 @@ return result
"""Check that persistent distributed Cache Plugin can handle keys """Check that persistent distributed Cache Plugin can handle keys
more than 250 bytes and values more than 1024 bytes. more than 250 bytes and values more than 1024 bytes.
""" """
print print()
print '=' * 40 print('=' * 40)
print 'TESTING: Long Keys and Large values' print('TESTING: Long Keys and Large values')
portal = self.portal portal = self.portal
# import the local and clear it # import the local and clear it
from Products.ERP5Type.CachePlugins.DistributedRamCache import\ from Products.ERP5Type.CachePlugins.DistributedRamCache import\
...@@ -410,7 +411,7 @@ return 'a' * 1024 * 1024 * 25 ...@@ -410,7 +411,7 @@ return 'a' * 1024 * 1024 * 25
long_parameter=long_parameter) long_parameter=long_parameter)
end = time.time() end = time.time()
calculation_time = end-start calculation_time = end-start
print "\n\tCalculation time (1st call)", calculation_time print("\n\tCalculation time (1st call)", calculation_time)
self.assertEqual(cached, result) self.assertEqual(cached, result)
self.commit() self.commit()
...@@ -423,7 +424,7 @@ return 'a' * 1024 * 1024 * 25 ...@@ -423,7 +424,7 @@ return 'a' * 1024 * 1024 * 25
long_parameter=long_parameter) long_parameter=long_parameter)
end = time.time() end = time.time()
calculation_time = end-start calculation_time = end-start
print "\n\tCalculation time (2nd call)", calculation_time print("\n\tCalculation time (2nd call)", calculation_time)
self.assertTrue(1.0 > calculation_time, "1.0 <= %s" % calculation_time) self.assertTrue(1.0 > calculation_time, "1.0 <= %s" % calculation_time)
self.assertEqual(cached, result) self.assertEqual(cached, result)
self.commit() self.commit()
...@@ -431,37 +432,37 @@ return 'a' * 1024 * 1024 * 25 ...@@ -431,37 +432,37 @@ return 'a' * 1024 * 1024 * 25
def test_06_CheckCacheExpiration(self): def test_06_CheckCacheExpiration(self):
"""Check that expiracy is well handle by Cache Plugins """Check that expiracy is well handle by Cache Plugins
""" """
print print()
print "="*40 print("="*40)
print "TESTING: Cache Expiration Time" print("TESTING: Cache Expiration Time")
py_script_obj = getattr(self.portal, self.python_script_id) py_script_obj = getattr(self.portal, self.python_script_id)
cache_factory_list = ('ram_cache_factory', 'distributed_ram_cache_factory', cache_factory_list = ('ram_cache_factory', 'distributed_ram_cache_factory',
'distributed_persistent_cache_factory') 'distributed_persistent_cache_factory')
for cache_factory in cache_factory_list: for cache_factory in cache_factory_list:
print '\n\t==> %s' % cache_factory print('\n\t==> %s' % cache_factory)
my_cache = CachingMethod(py_script_obj, my_cache = CachingMethod(py_script_obj,
'py_script_obj', 'py_script_obj',
cache_factory=cache_factory) cache_factory=cache_factory)
# First call, fill the cache # First call, fill the cache
calculation_time = self._callCache(my_cache, real_calculation=True) calculation_time = self._callCache(my_cache, real_calculation=True)
print "\n\tCalculation time (1st call)", calculation_time print("\n\tCalculation time (1st call)", calculation_time)
## 2nd call - should be cached now ## 2nd call - should be cached now
calculation_time = self._callCache(my_cache, real_calculation=False) calculation_time = self._callCache(my_cache, real_calculation=False)
print "\n\tCalculation time (2nd call)", calculation_time print("\n\tCalculation time (2nd call)", calculation_time)
# Wait expiration period then check that value is computed # Wait expiration period then check that value is computed
# .1 is an additional epsilon delay to work around time precision issues # .1 is an additional epsilon delay to work around time precision issues
time_left_to_wait = .1 + self.cache_duration time_left_to_wait = .1 + self.cache_duration
print "\n\tSleep %.2f seconds to wait expiration time" % time_left_to_wait print("\n\tSleep %.2f seconds to wait expiration time" % time_left_to_wait)
time.sleep(time_left_to_wait) time.sleep(time_left_to_wait)
# Call conversion for ram_cache_factory # Call conversion for ram_cache_factory
calculation_time = self._callCache(my_cache, real_calculation=True) calculation_time = self._callCache(my_cache, real_calculation=True)
print "\n\tCalculation time (3rd call)", calculation_time print("\n\tCalculation time (3rd call)", calculation_time)
def test_06_CheckCacheBag(self): def test_06_CheckCacheBag(self):
""" """
......
bt5/erp5_crm/TestTemplateItem/portal_components/test.erp5.testEditorField.py
View file @ d5f0b003
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
# #
############################################################################## ##############################################################################
from __future__ import print_function
import unittest import unittest
from AccessControl.SecurityManagement import newSecurityManager from AccessControl.SecurityManagement import newSecurityManager
...@@ -131,12 +132,12 @@ class TestEditorField(ERP5TypeTestCase, ZopeTestCase.Functional): ...@@ -131,12 +132,12 @@ class TestEditorField(ERP5TypeTestCase, ZopeTestCase.Functional):
match_string1 = 'data-gadget-editable="field_%s"' % field_id match_string1 = 'data-gadget-editable="field_%s"' % field_id
match_string2 = 'data-gadget-value="%s"' % html_quote(text_content) match_string2 = 'data-gadget-value="%s"' % html_quote(text_content)
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)
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)
return False return False
return True return True
...@@ -156,13 +157,13 @@ class TestEditorField(ERP5TypeTestCase, ZopeTestCase.Functional): ...@@ -156,13 +157,13 @@ class TestEditorField(ERP5TypeTestCase, ZopeTestCase.Functional):
match_string1 = 'data-gadget-editable="field_%s"' % field_id match_string1 = 'data-gadget-editable="field_%s"' % field_id
match_string2 = 'data-gadget-value="%s"' % html_quote(text_content) match_string2 = 'data-gadget-value="%s"' % html_quote(text_content)
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() 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() import pdb; pdb.set_trace()
return False return False
return True return True
...@@ -182,12 +183,12 @@ class TestEditorField(ERP5TypeTestCase, ZopeTestCase.Functional): ...@@ -182,12 +183,12 @@ class TestEditorField(ERP5TypeTestCase, ZopeTestCase.Functional):
match_string1 = "data-gadget-editable=" match_string1 = "data-gadget-editable="
match_string2 = 'data-gadget-value="%s"' % html_quote(text_content) match_string2 = 'data-gadget-value="%s"' % html_quote(text_content)
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)
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)
return False return False
return True return True
......
bt5/erp5_dms/TestTemplateItem/portal_components/test.erp5.testDms.py
View file @ d5f0b003
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
These are subject to another suite "testIngestion". These are subject to another suite "testIngestion".
""" """
from __future__ import print_function
import unittest import unittest
import time import time
from six.moves import cStringIO as StringIO from six.moves import cStringIO as StringIO
...@@ -828,7 +829,7 @@ class TestDocument(TestDocumentMixin): ...@@ -828,7 +829,7 @@ class TestDocument(TestDocumentMixin):
if portal_type is not None: if portal_type is not None:
kw['portal_type'] = portal_type kw['portal_type'] = portal_type
if src__==1: if src__==1:
print portal.portal_catalog(src__=src__,**kw) print(portal.portal_catalog(src__=src__,**kw))
result_list = [x.getObject() for x in portal.portal_catalog(**kw)] result_list = [x.getObject() for x in portal.portal_catalog(**kw)]
return [x for x in result_list if x in test_document_set] return [x for x in result_list if x in test_document_set]
......
bt5/erp5_performance_test/TestTemplateItem/portal_components/test.erp5.testWorkflowPerformance.py
View file @ d5f0b003
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
# #
############################################################################## ##############################################################################
from __future__ import print_function
from test import pystone from test import pystone
from time import time from time import time
from six.moves import range from six.moves import range
...@@ -73,10 +74,10 @@ class TestWorkflowPerformance(TestPerformanceMixin): ...@@ -73,10 +74,10 @@ class TestWorkflowPerformance(TestPerformanceMixin):
end = time() end = time()
print "\n%s pystones/second" % pystone.pystones()[1] print("\n%s pystones/second" % pystone.pystones()[1])
message = "\n%s took %.4gs (%s foo(s))" % (self._testMethodName, message = "\n%s took %.4gs (%s foo(s))" % (self._testMethodName,
end - start, foo_count) end - start, foo_count)
print message print(message)
ZopeTestCase._print(message) ZopeTestCase._print(message)
# some checking to make sure we tested something relevant # some checking to make sure we tested something relevant
......
bt5/erp5_safeimage/ExtensionTemplateItem/portal_components/extension.erp5.ERP5SafeImage_Selenium.py
View file @ d5f0b003
from __future__ import print_function
import PIL.Image as PIL_Image import PIL.Image as PIL_Image
import os import os
import transaction import transaction
...@@ -42,9 +43,9 @@ def uploadImage(self): ...@@ -42,9 +43,9 @@ def uploadImage(self):
def cleanUp(self): def cleanUp(self):
portal = self.getPortalObject() portal = self.getPortalObject()
print "exists path: %r" %os.path.exists("tmp/selenium_image_test.jpg") print("exists path: %r" %os.path.exists("tmp/selenium_image_test.jpg"))
if os.path.exists("tmp/selenium_image_test.jpg"): if os.path.exists("tmp/selenium_image_test.jpg"):
print "REMOVE IMAGE: %s" %(os.remove("tmp/selenium_image_test.jpg")) print("REMOVE IMAGE: %s" %(os.remove("tmp/selenium_image_test.jpg")))
portal.image_module.manage_delObjects(ids=['testTileTransformed']) portal.image_module.manage_delObjects(ids=['testTileTransformed'])
return True return True
else: else:
......
bt5/erp5_safeimage/ExtensionTemplateItem/portal_components/extension.erp5.ERP5ZoomifyImage.py
View file @ d5f0b003
...@@ -16,6 +16,7 @@ ...@@ -16,6 +16,7 @@
# 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 six.moves import cStringIO as StringIO from six.moves import cStringIO as StringIO
from zLOG import LOG,ERROR,INFO,WARNING from zLOG import LOG,ERROR,INFO,WARNING
...@@ -175,15 +176,15 @@ class ZoomifyBase: ...@@ -175,15 +176,15 @@ 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" 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( print("os path exist : %r" % os.path.exists(os.path.join(
tempfile.gettempdir(), saveFilename)) 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
...@@ -191,7 +192,7 @@ class ZoomifyBase: ...@@ -191,7 +192,7 @@ 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) 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:
......
bt5/erp5_simplified_invoicing/TestTemplateItem/portal_components/test.erp5.testInvoice.py
View file @ d5f0b003
...@@ -30,6 +30,7 @@ ...@@ -30,6 +30,7 @@
Tests invoice creation from simulation. Tests invoice creation from simulation.
""" """
from __future__ import print_function
import xml.dom.minidom import xml.dom.minidom
import zipfile import zipfile
...@@ -1273,7 +1274,7 @@ self.portal.getDefaultModule(self.packing_list_portal_type).newContent( ...@@ -1273,7 +1274,7 @@ self.portal.getDefaultModule(self.packing_list_portal_type).newContent(
def _acceptDivergenceOnInvoice(self, invoice, divergence_list): def _acceptDivergenceOnInvoice(self, invoice, divergence_list):
print invoice, divergence_list print(invoice, divergence_list)
self._solveDivergence(invoice, 'quantity', 'Accept Solver') self._solveDivergence(invoice, 'quantity', 'Accept Solver')
def test_accept_quantity_divergence_on_invoice_with_stopped_packing_list( def test_accept_quantity_divergence_on_invoice_with_stopped_packing_list(
...@@ -1326,7 +1327,7 @@ self.portal.getDefaultModule(self.packing_list_portal_type).newContent( ...@@ -1326,7 +1327,7 @@ self.portal.getDefaultModule(self.packing_list_portal_type).newContent(
self.assertEqual('solved', packing_list.getCausalityState()) self.assertEqual('solved', packing_list.getCausalityState())
def _adoptDivergenceOnInvoice(self, invoice, divergence_list): def _adoptDivergenceOnInvoice(self, invoice, divergence_list):
print invoice, divergence_list print(invoice, divergence_list)
self._solveDivergence(invoice, 'quantity', 'Adopt Solver') self._solveDivergence(invoice, 'quantity', 'Adopt Solver')
def test_adopt_quantity_divergence_on_invoice_line_with_stopped_packing_list( def test_adopt_quantity_divergence_on_invoice_line_with_stopped_packing_list(
......
bt5/erp5_simplified_invoicing/TestTemplateItem/portal_components/test.erp5.testSimulationPerformance.py
View file @ d5f0b003
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
# #
############################################################################## ##############################################################################
from __future__ import print_function
import subprocess import subprocess
import unittest import unittest
from test import pystone from test import pystone
...@@ -58,7 +59,7 @@ class TestSimulationPerformance(TestTradeModelLineSale): ...@@ -58,7 +59,7 @@ class TestSimulationPerformance(TestTradeModelLineSale):
self.test_01_OrderWithSimpleTaxedAndDiscountedLines() self.test_01_OrderWithSimpleTaxedAndDiscountedLines()
self.__class__._order = self['order'].getRelativeUrl() self.__class__._order = self['order'].getRelativeUrl()
self.runAlarms() self.runAlarms()
print "\n%s pystones/second" % pystone.pystones()[1] print("\n%s pystones/second" % pystone.pystones()[1])
def perf_01_invoiceSimpleOrder(self, order_count=1): def perf_01_invoiceSimpleOrder(self, order_count=1):
start = time() start = time()
...@@ -119,8 +120,8 @@ class TestSimulationPerformance(TestTradeModelLineSale): ...@@ -119,8 +120,8 @@ class TestSimulationPerformance(TestTradeModelLineSale):
self.runAlarms() self.runAlarms()
end = time() end = time()
print "\n%s took %.4gs (%s order(s))" % (self._testMethodName, print("\n%s took %.4gs (%s order(s))" % (self._testMethodName,
end - start, order_count) end - start, order_count))
def perf_02_invoiceManySimpleOrders(self): def perf_02_invoiceManySimpleOrders(self):
self.perf_01_invoiceSimpleOrder(10) self.perf_01_invoiceSimpleOrder(10)
......
bt5/erp5_simulation_performance_test/TestTemplateItem/portal_components/test.erp5.testSimulationElementPerformance.py
View file @ d5f0b003
...@@ -69,6 +69,7 @@ and that between Sale Packing List and Sale Invoice is M:N. ...@@ -69,6 +69,7 @@ and that between Sale Packing List and Sale Invoice is M:N.
""" """
from __future__ import print_function
import unittest import unittest
from time import time from time import time
import gc import gc
...@@ -305,8 +306,8 @@ class TestSimulationPerformance(ERP5TypeTestCase, LogInterceptor): ...@@ -305,8 +306,8 @@ class TestSimulationPerformance(ERP5TypeTestCase, LogInterceptor):
after_time = time() after_time = time()
amount_of_time = after_time - before_time amount_of_time = after_time - before_time
min_time, max_time = self._getMinMaxTime(target) min_time, max_time = self._getMinMaxTime(target)
print "\n%s took %.4f (%.4f < %.4f < %.4f)" \ print("\n%s took %.4f (%.4f < %.4f < %.4f)" \
% (target, amount_of_time, min_time, amount_of_time, max_time) % (target, amount_of_time, min_time, amount_of_time, max_time))
# Reset the target to make sure that the same target is not # Reset the target to make sure that the same target is not
# measured again. # measured again.
sequence.edit(measure_target=None) sequence.edit(measure_target=None)
...@@ -793,13 +794,13 @@ class TestSimulationPerformance(ERP5TypeTestCase, LogInterceptor): ...@@ -793,13 +794,13 @@ class TestSimulationPerformance(ERP5TypeTestCase, LogInterceptor):
if measurable: if measurable:
result = sequence.get('result') result = sequence.get('result')
if result: if result:
print '' print('')
failure_list = [] failure_list = []
for target, min_time, real_time, max_time in result: for target, min_time, real_time, max_time in result:
condition = (min_time < real_time < max_time) condition = (min_time < real_time < max_time)
print '%s%s: %.4f < %.4f < %.4f' \ print('%s%s: %.4f < %.4f < %.4f' \
% (condition and ' ' or '!', % (condition and ' ' or '!',
target, min_time, real_time, max_time) target, min_time, real_time, max_time))
if not condition: if not condition:
failure_list.append(target) failure_list.append(target)
self.assertTrue(not failure_list, self.assertTrue(not failure_list,
......
bt5/erp5_ui_test/TestTemplateItem/portal_components/test.erp5.testPerformance.py
View file @ d5f0b003
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
# #
############################################################################## ##############################################################################
from __future__ import print_function
from time import time from time import time
import gc import gc
import subprocess import subprocess
...@@ -220,8 +221,8 @@ class TestPerformance(TestPerformanceMixin): ...@@ -220,8 +221,8 @@ class TestPerformance(TestPerformanceMixin):
bar.Bar_viewPerformance() bar.Bar_viewPerformance()
after_view = time() after_view = time()
req_time = (after_view - before_view)/100. req_time = (after_view - before_view)/100.
print "%s time to view object form %.4f < %.4f < %.4f\n" % \ print("%s time to view object form %.4f < %.4f < %.4f\n" % \
(prefix, min_, req_time, max_) (prefix, min_, req_time, max_))
if PROFILE: if PROFILE:
self.profile(bar.Bar_viewPerformance) self.profile(bar.Bar_viewPerformance)
if DO_TEST: if DO_TEST:
...@@ -292,10 +293,10 @@ class TestPerformance(TestPerformanceMixin): ...@@ -292,10 +293,10 @@ class TestPerformance(TestPerformanceMixin):
add_value = add_result[key] add_value = add_result[key]
min_view = MIN_MODULE_VIEW + LISTBOX_COEF * i min_view = MIN_MODULE_VIEW + LISTBOX_COEF * i
max_view = MAX_MODULE_VIEW + LISTBOX_COEF * i max_view = MAX_MODULE_VIEW + LISTBOX_COEF * i
print "nb objects = %s\n\tadd = %.4f < %.4f < %.4f" %(key, MIN_OBJECT_CREATION, add_value, MAX_OBJECT_CREATION) print("nb objects = %s\n\tadd = %.4f < %.4f < %.4f" %(key, MIN_OBJECT_CREATION, add_value, MAX_OBJECT_CREATION))
print "\ttic = %.4f < %.4f < %.4f" %(MIN_TIC, tic_value, MAX_TIC) print("\ttic = %.4f < %.4f < %.4f" %(MIN_TIC, tic_value, MAX_TIC))
print "\tview = %.4f < %.4f < %.4f" %(min_view, module_value, max_view) print("\tview = %.4f < %.4f < %.4f" %(min_view, module_value, max_view))
print print()
i += 1 i += 1
# then check results # then check results
if DO_TEST: if DO_TEST:
...@@ -338,10 +339,10 @@ class TestPerformance(TestPerformanceMixin): ...@@ -338,10 +339,10 @@ class TestPerformance(TestPerformanceMixin):
after_view = time() after_view = time()
req_time = (after_view - before_view)/100. req_time = (after_view - before_view)/100.
print "time to view proxyfield form %.4f < %.4f < %.4f\n" % \ print("time to view proxyfield form %.4f < %.4f < %.4f\n" % \
( MIN_OBJECT_PROXYFIELD_VIEW, ( MIN_OBJECT_PROXYFIELD_VIEW,
req_time, req_time,
MAX_OBJECT_PROXYFIELD_VIEW ) MAX_OBJECT_PROXYFIELD_VIEW ))
if PROFILE: if PROFILE:
self.profile(foo.Foo_viewProxyField) self.profile(foo.Foo_viewProxyField)
if DO_TEST: if DO_TEST:
...@@ -369,10 +370,10 @@ class TestPerformance(TestPerformanceMixin): ...@@ -369,10 +370,10 @@ class TestPerformance(TestPerformanceMixin):
after_view = time() after_view = time()
req_time = (after_view - before_view)/100. req_time = (after_view - before_view)/100.
print "time to view object form with many lines %.4f < %.4f < %.4f\n" % \ print("time to view object form with many lines %.4f < %.4f < %.4f\n" % \
( MIN_OBJECT_MANY_LINES_VIEW, ( MIN_OBJECT_MANY_LINES_VIEW,
req_time, req_time,
MAX_OBJECT_MANY_LINES_VIEW ) MAX_OBJECT_MANY_LINES_VIEW ))
if PROFILE: if PROFILE:
self.profile(foo.Foo_viewPerformance) self.profile(foo.Foo_viewPerformance)
if DO_TEST: if DO_TEST:
...@@ -408,12 +409,12 @@ class TestPropertyPerformance(TestPerformanceMixin): ...@@ -408,12 +409,12 @@ class TestPropertyPerformance(TestPerformanceMixin):
after = time() after = time()
total_time = (after - before) / 100. total_time = (after - before) / 100.
print ("time %s.%s %.4f < %.4f < %.4f\n" % \ print(("time %s.%s %.4f < %.4f < %.4f\n" % \
( self.id(), ( self.id(),
f.__doc__ or f.__name__, f.__doc__ or f.__name__,
min_time, min_time,
total_time, total_time,
max_time )) max_time )))
if PROFILE: if PROFILE:
self.profile(f, args=(i, )) self.profile(f, args=(i, ))
if DO_TEST: if DO_TEST:
......
bt5/erp5_web_monitoring_ui_test/TestTemplateItem/portal_components/test.erp5.testFunctionalOfficejsMonitoring.py
View file @ d5f0b003
...@@ -24,6 +24,7 @@ ...@@ -24,6 +24,7 @@
# 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 unittest import unittest
from Products.ERP5Type.tests.ERP5TypeFunctionalTestCase import ERP5TypeFunctionalTestCase from Products.ERP5Type.tests.ERP5TypeFunctionalTestCase import ERP5TypeFunctionalTestCase
...@@ -86,7 +87,7 @@ class TestZeleniumCore(ERP5TypeFunctionalTestCase): ...@@ -86,7 +87,7 @@ class TestZeleniumCore(ERP5TypeFunctionalTestCase):
ERP5TypeFunctionalTestCase.afterSetUp(self) ERP5TypeFunctionalTestCase.afterSetUp(self)
self.http_root_dir = tempfile.mkdtemp() self.http_root_dir = tempfile.mkdtemp()
print "Serving files on http from %r" % self.http_root_dir print("Serving files on http from %r" % self.http_root_dir)
self.generateMonitoringInstanceTree() self.generateMonitoringInstanceTree()
self.httpd_is_alive = True self.httpd_is_alive = True
......
bt5/erp5_workflow_test/TestTemplateItem/portal_components/test.erp5.testWorkflowAndDCWorkflow.py
View file @ d5f0b003
from __future__ import print_function
import six.moves.urllib.parse import six.moves.urllib.parse
import unittest import unittest
from erp5.component.mixin.TestWorkflowMixin import TestWorkflowMixin from erp5.component.mixin.TestWorkflowMixin import TestWorkflowMixin
...@@ -412,9 +413,9 @@ class TestConvertedWorkflow(TestERP5WorkflowMixin): ...@@ -412,9 +413,9 @@ class TestConvertedWorkflow(TestERP5WorkflowMixin):
text_document3 = self.getTestObject() text_document3 = self.getTestObject()
text_document3_permission = getattr(text_document3, permission_key, None) text_document3_permission = getattr(text_document3, permission_key, None)
print 'text_document1_permission: %r' % (text_document1_permission, ) print('text_document1_permission: %r' % (text_document1_permission, ))
print 'text_document2_permission: %r' % (text_document2_permission, ) print('text_document2_permission: %r' % (text_document2_permission, ))
print 'text_document3_permission: %r' % (text_document3_permission, ) print('text_document3_permission: %r' % (text_document3_permission, ))
self.assertEqual(tuple(getattr(text_document3, permission_key)), self.assertEqual(tuple(getattr(text_document3, permission_key)),
('Assignee', 'Assignor', 'Auditor', 'Author')) ('Assignee', 'Assignor', 'Auditor', 'Author'))
......
product/ERP5/tests/erp5_url_checker.py
View file @ d5f0b003
...@@ -12,6 +12,7 @@ ...@@ -12,6 +12,7 @@
# user: user1 password: user1 # user: user1 password: user1
# user: user2 password: user2 # user: user2 password: user2
from __future__ import print_function
from threading import Thread from threading import Thread
from time import sleep from time import sleep
from urllib import addinfourl from urllib import addinfourl
......
product/Zelenium/scripts/tinyWebServer.py
View file @ d5f0b003
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
# serves files relative to the current directory. # serves files relative to the current directory.
# cgi-bin directory serves Python CGIs. # cgi-bin directory serves Python CGIs.
from __future__ import print_function
import six.moves.BaseHTTPServer import six.moves.BaseHTTPServer
import six.moves.CGIHTTPServer import six.moves.CGIHTTPServer
import time import time
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7