Commit 1aa02397 authored by Kazuhiko Shiozaki's avatar Kazuhiko Shiozaki Committed by Jérome Perrin

py2/py3: use hexdigest instead of digest in inventory cache key to avoid non-valid UTF-8 bytes.

parent 57ba5f72
...@@ -37,6 +37,7 @@ from Products.ERP5Type.Globals import InitializeClass ...@@ -37,6 +37,7 @@ from Products.ERP5Type.Globals import InitializeClass
from Products.ERP5Type import Permissions from Products.ERP5Type import Permissions
from Products.ERP5Type.Tool.BaseTool import BaseTool from Products.ERP5Type.Tool.BaseTool import BaseTool
from Products.ERP5Type.UnrestrictedMethod import UnrestrictedMethod from Products.ERP5Type.UnrestrictedMethod import UnrestrictedMethod
from Products.ERP5Type.Utils import str2bytes
from zLOG import LOG, PROBLEM, WARNING, INFO from zLOG import LOG, PROBLEM, WARNING, INFO
...@@ -1411,10 +1412,10 @@ class SimulationTool(BaseTool): ...@@ -1411,10 +1412,10 @@ class SimulationTool(BaseTool):
if src__: if src__:
sql_source_list = [] sql_source_list = []
# Generate the cache key (md5 of query source) # Generate the cache key (md5 of query source)
sql_text_hash = md5(Resource_zGetInventoryList( sql_text_hash = md5(str2bytes(Resource_zGetInventoryList(
stock_table_id=stock_table_id, stock_table_id=stock_table_id,
src__=1, src__=1,
**kw)).digest() **kw))).hexdigest()
# Try to get result from cache # Try to get result from cache
Resource_zGetInventoryCacheResult = self.Resource_zGetInventoryCacheResult Resource_zGetInventoryCacheResult = self.Resource_zGetInventoryCacheResult
inventory_cache_kw = {'query': sql_text_hash} inventory_cache_kw = {'query': sql_text_hash}
......
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