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
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Rafael Monnerat
erp5
Commits
bd14f3a6
Commit
bd14f3a6
authored
Oct 11, 2019
by
Arnaud Fontaine
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
PortalTransforms: subprocesstransform: Make sure that the NamedTemporaryFile is closed.
parent
225fc819
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
20 additions
and
20 deletions
+20
-20
product/PortalTransforms/libtransforms/commandtransform.py
product/PortalTransforms/libtransforms/commandtransform.py
+20
-20
No files found.
product/PortalTransforms/libtransforms/commandtransform.py
View file @
bd14f3a6
...
...
@@ -147,24 +147,24 @@ class subprocesstransform:
def
convert
(
self
,
data
,
cache
,
**
kwargs
):
command
=
"%s %s"
%
(
self
.
binary
,
self
.
binaryArgs
)
stdin_file
=
PIPE
try
:
if
not
self
.
useStdin
:
stdin_file
=
tempfile
.
NamedTemporaryFile
()
stdin_file
.
write
(
data
)
stdin_file
.
seek
(
0
)
command
=
command
%
{
'infile'
:
stdin_file
.
name
}
# apply tmp name to command
data
=
None
argument_list
=
shlex
.
split
(
command
)
process
=
Popen
(
argument_list
,
stdin
=
stdin_file
,
stdout
=
PIPE
,
stderr
=
PIPE
,
close_fds
=
True
)
data_out
,
data_err
=
process
.
communicate
(
input
=
data
)
if
process
.
returncode
:
raise
OSError
,
data_err
cache
.
setData
(
data_out
)
return
cache
if
not
self
.
useStdin
:
tempfile_object
=
tempfile
.
NamedTemporaryFile
()
tmpname
=
tempfile_object
.
name
tempfile_object
.
write
(
data
)
tempfile_object
.
seek
(
0
)
command
=
command
%
{
'infile'
:
tmpname
}
# apply tmp name to command
argument_list
=
shlex
.
split
(
command
)
if
self
.
useStdin
:
process
=
Popen
(
argument_list
,
stdin
=
tempfile_object
,
stdout
=
PIPE
,
stderr
=
PIPE
,
close_fds
=
True
)
data_out
,
data_err
=
process
.
communicate
()
tempfile_object
.
close
()
else
:
process
=
Popen
(
argument_list
,
stdin
=
PIPE
,
stdout
=
PIPE
,
stderr
=
PIPE
,
close_fds
=
True
)
data_out
,
data_err
=
process
.
communicate
(
input
=
data
)
if
process
.
returncode
:
raise
OSError
,
data_err
cache
.
setData
(
data_out
)
return
cache
finally
:
if
isinstance
(
stdin_file
,
file
):
stdin_file
.
close
()
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