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
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Titouan Soulard
erp5
Commits
0f8c3d50
Commit
0f8c3d50
authored
2 years ago
by
Kazuhiko Shiozaki
Committed by
Arnaud Fontaine
1 year ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
py2/py3: explicitly cast to list for dict.keys() or dict.items() + list.
parent
157950c5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
7 additions
and
4 deletions
+7
-4
bt5/erp5_data_notebook/ExtensionTemplateItem/portal_components/extension.erp5.JupyterCompile.py
...teItem/portal_components/extension.erp5.JupyterCompile.py
+2
-1
bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/ERP5Site_filterRequestForDeferredStyle.py
...rred_style_core/ERP5Site_filterRequestForDeferredStyle.py
+2
-1
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_setCausalityFromSimulation.py
...l_skins/erp5_trade/Delivery_setCausalityFromSimulation.py
+2
-1
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_quantity_unit_conversion_list.sql
..._mysql_innodb/z_catalog_quantity_unit_conversion_list.sql
+1
-1
No files found.
bt5/erp5_data_notebook/ExtensionTemplateItem/portal_components/extension.erp5.JupyterCompile.py
View file @
0f8c3d50
...
...
@@ -17,6 +17,7 @@ import Acquisition
import
astor
import
importlib
from
erp5.component.module.Log
import
log
from
Products.ERP5Type.Utils
import
ensure_list
# Display matplotlib figure automatically like
# the original python kernel
...
...
@@ -495,7 +496,7 @@ def Base_runJupyterCode(self, jupyter_code, old_notebook_context):
# Saves a list of all the variables we injected into the user context and
# shall be deleted before saving the context.
volatile_variable_list
=
current_setup_dict
.
keys
()
+
inject_variable_dict
.
keys
(
)
+
user_context
.
get
(
'_volatile_variable_list'
,
[])
volatile_variable_list
=
ensure_list
(
current_setup_dict
.
keys
())
+
ensure_list
(
inject_variable_dict
.
keys
()
)
+
user_context
.
get
(
'_volatile_variable_list'
,
[])
volatile_variable_list
.
append
(
'__builtins__'
)
for
key
,
val
in
user_context
.
items
():
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_deferred_style/SkinTemplateItem/portal_skins/erp5_deferred_style_core/ERP5Site_filterRequestForDeferredStyle.py
View file @
0f8c3d50
from
Products.ERP5Type.Utils
import
ensure_list
new_request
=
{}
for
k
,
v
in
request
.
other
.
items
()
+
request
.
form
.
items
(
):
for
k
,
v
in
ensure_list
(
request
.
other
.
items
())
+
ensure_list
(
request
.
form
.
items
()
):
if
k
not
in
(
'TraversalRequestNameStack'
,
'AUTHENTICATED_USER'
,
'URL'
,
'SERVER_URL'
,
'AUTHENTICATION_PATH'
,
'USER_PREF_LANGUAGES'
,
'PARENTS'
,
'PUBLISHED'
,
'AcceptLanguage'
,
'AcceptCharset'
,
'RESPONSE'
,
'SESSION'
,
...
...
This diff is collapsed.
Click to expand it.
bt5/erp5_trade/SkinTemplateItem/portal_skins/erp5_trade/Delivery_setCausalityFromSimulation.py
View file @
0f8c3d50
...
...
@@ -9,6 +9,7 @@ It will also not work if strict security is set on simulation. It's recommended
delivery builder.
"""
from
erp5.component.module.Log
import
log
from
Products.ERP5Type.Utils
import
ensure_list
LOG
=
lambda
msg
:
log
(
"Delivery_setCausalityFromSimulation on %s"
%
context
.
getPath
(),
msg
)
LOG
=
lambda
msg
:
'DISABLED'
...
...
@@ -36,4 +37,4 @@ for simulation_movement in simulation_movement_list :
causality_value_set
[
explanation_value
]
=
1
LOG
(
'setCausalityValueList %s'
%
causality_value_set
.
keys
())
delivery
.
setCausalityValueList
(
causality_value_set
.
keys
()
+
delivery
.
getCausalityValueList
(
))
delivery
.
setCausalityValueList
(
ensure_list
(
causality_value_set
.
keys
())
+
ensure_list
(
delivery
.
getCausalityValueList
()
))
This diff is collapsed.
Click to expand it.
product/ERP5/bootstrap/erp5_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_quantity_unit_conversion_list.sql
View file @
0f8c3d50
...
...
@@ -13,7 +13,7 @@
<
dtml
-
if
quantity_unit_conversion_dict
>
DELETE
FROM
`quantity_unit_conversion`
WHERE
<
dtml
-
sqltest
"quantity_unit_conversion_dict.keys(
)"
column
=
"resource_uid"
type
=
"int"
multiple
>
<
dtml
-
sqltest
expr
=
"set(quantity_unit_conversion_dict.keys()
)"
column
=
"resource_uid"
type
=
"int"
multiple
>
<
dtml
-
var
sql_delimiter
>
...
...
This diff is collapsed.
Click to expand it.
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