Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Labels
Merge Requests
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Jérome Perrin
erp5
Commits
ab5bd5c5
Commit
ab5bd5c5
authored
Oct 10, 2022
by
Kazuhiko Shiozaki
Committed by
Jérome Perrin
Mar 15, 2023
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
py2/py3: use hexdigest instead of digest in inventory cache key to avoid non-valid UTF-8 bytes.
parent
be2f38c3
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
2 deletions
+3
-2
product/ERP5/bootstrap/erp5_core/ToolComponentTemplateItem/portal_components/tool.erp5.SimulationTool.py
...emplateItem/portal_components/tool.erp5.SimulationTool.py
+3
-2
No files found.
product/ERP5/bootstrap/erp5_core/ToolComponentTemplateItem/portal_components/tool.erp5.SimulationTool.py
View file @
ab5bd5c5
...
@@ -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
))
).
hex
digest
()
# 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
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment