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
e9e33b40
Commit
e9e33b40
authored
Mar 16, 2023
by
Kazuhiko Shiozaki
Committed by
Jérome Perrin
May 20, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
py2/py3: use FileIO class instead of file class, that does not exist in Python 3.
parent
a63769fb
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
4 deletions
+11
-4
bt5/erp5_safeimage/TestTemplateItem/portal_components/test.erp5.testSafeImage.py
...TemplateItem/portal_components/test.erp5.testSafeImage.py
+3
-2
product/ERP5Type/tests/utils.py
product/ERP5Type/tests/utils.py
+8
-2
No files found.
bt5/erp5_safeimage/TestTemplateItem/portal_components/test.erp5.testSafeImage.py
View file @
e9e33b40
from
Products.ERP5Type.tests.ERP5TypeTestCase
import
ERP5TypeTestCase
from
Products.ERP5Type.tests.ERP5TypeTestCase
import
ERP5TypeTestCase
import
transaction
import
transaction
from
io
import
FileIO
import
os
import
os
class
FileUpload
(
file
):
class
FileUpload
(
FileIO
):
"""Act as an uploaded file.
"""Act as an uploaded file.
"""
"""
__allow_access_to_unprotected_subobjects__
=
1
__allow_access_to_unprotected_subobjects__
=
1
def
__init__
(
self
,
path
,
name
):
def
__init__
(
self
,
path
,
name
):
self
.
filename
=
name
self
.
filename
=
name
file
.
__init__
(
self
,
path
)
super
(
FileUpload
,
self
).
__init__
(
path
)
self
.
headers
=
{}
self
.
headers
=
{}
...
...
product/ERP5Type/tests/utils.py
View file @
e9e33b40
...
@@ -57,6 +57,11 @@ import pytz
...
@@ -57,6 +57,11 @@ import pytz
import
six
import
six
import
lxml.html
import
lxml.html
if
six
.
PY2
:
FileIO
=
file
else
:
from
io
import
FileIO
def
canonical_html
(
html
):
def
canonical_html
(
html
):
# type: (str) -> str
# type: (str) -> str
...
@@ -68,7 +73,7 @@ def canonical_html(html):
...
@@ -68,7 +73,7 @@ def canonical_html(html):
).
decode
(
'utf-8'
)
).
decode
(
'utf-8'
)
class
FileUpload
(
file
):
class
FileUpload
(
FileIO
):
"""Act as an uploaded file.
"""Act as an uploaded file.
"""
"""
__allow_access_to_unprotected_subobjects__
=
1
__allow_access_to_unprotected_subobjects__
=
1
...
@@ -76,9 +81,10 @@ class FileUpload(file):
...
@@ -76,9 +81,10 @@ class FileUpload(file):
if
name
is
None
:
if
name
is
None
:
name
=
os
.
path
.
basename
(
path
)
name
=
os
.
path
.
basename
(
path
)
self
.
filename
=
name
self
.
filename
=
name
file
.
__init__
(
self
,
path
)
FileIO
.
__init__
(
self
,
path
)
self
.
headers
=
{}
self
.
headers
=
{}
# dummy objects
# dummy objects
class
DummyMailHostMixin
(
object
):
class
DummyMailHostMixin
(
object
):
"""Dummy Mail Host that doesn't really send messages and keep a copy in
"""Dummy Mail Host that doesn't really send messages and keep a copy in
...
...
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