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
6b633bfa
Commit
6b633bfa
authored
2 years ago
by
Kazuhiko Shiozaki
Committed by
Jérome Perrin
7 months ago
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
py2/py3: subprocesstransform.convert() argument can by str in Python 3.
parent
1fd8566e
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
0 deletions
+3
-0
product/PortalTransforms/libtransforms/commandtransform.py
product/PortalTransforms/libtransforms/commandtransform.py
+3
-0
No files found.
product/PortalTransforms/libtransforms/commandtransform.py
View file @
6b633bfa
...
...
@@ -5,6 +5,7 @@ import tempfile
import
re
import
shutil
from
os.path
import
join
,
basename
import
six
from
zope.interface
import
implementer
...
...
@@ -159,6 +160,8 @@ class subprocesstransform:
argument_list
=
shlex
.
split
(
command
)
process
=
Popen
(
argument_list
,
stdin
=
stdin_file
,
stdout
=
PIPE
,
stderr
=
PIPE
,
close_fds
=
True
)
if
six
.
PY3
and
isinstance
(
data
,
str
):
data
=
data
.
encode
()
data_out
,
data_err
=
process
.
communicate
(
input
=
data
)
if
process
.
returncode
:
raise
OSError
(
data_err
)
# XXX
...
...
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