Fixes #132 removes the temporary file #166
Conversation
securedrop_client/crypto.py
Outdated
| @@ -48,6 +48,7 @@ def decrypt_submission_or_reply(filepath, target_filename, home_dir, | |||
| logger.error("GPG error: {}".format(msg)) | |||
|
|
|||
| os.unlink(err.name) | |||
| os.unlink(out.name) | |||
There was a problem hiding this comment.
how about we can move these two lines to right before we return from this function? so that in both cases these files are cleaned up
out is a tempfile.NamedTemporaryFile created with delete=True, (default) so it'll get up deleted on disk once the file is closed. err is a tempfile.NamedTemporaryFile created with delete=False, so we'll need to delete it after closing it. This commit just makes sure both err and out are deleted after use. It also adds some comments for clarity.
redshiftzero
force-pushed
the
remove_the_temporary
branch
from
d1821f9
to
6ff708c
Compare
There was a problem hiding this comment.
see discussion in #132, but basically: turns out out.name is automatically cleaned up. i added a commit just clarifying this and making sure that err is cleaned up in the else stanza (should be empty but it doesn't hurt to explicitly delete)
|
Why not just use a context manager or (edit: this is just a nit) |
|
yepppp that is also good and equivalent. I just wanted to at least add explanatory comments (for the benefit of auditors) and make a minimal diff change for alpha. @joshuathayer pointed out in the issue that this entire file is all modified in the replies branch anyway so we'll be favoring the changes in there |
…t-warning update requests and urllib3
How to test?
Just run the standard tests.