From 15062c7fdfa07a3eb6ed2bb324c30e2e0968c4ad Mon Sep 17 00:00:00 2001 From: "Fabian P. Schmidt" Date: Sat, 4 Nov 2023 14:59:26 +0100 Subject: [PATCH 1/2] Improve error message for IOErrors --- virtualenvwrapper/hook_loader.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/virtualenvwrapper/hook_loader.py b/virtualenvwrapper/hook_loader.py index 449e651..cb2c865 100644 --- a/virtualenvwrapper/hook_loader.py +++ b/virtualenvwrapper/hook_loader.py @@ -146,14 +146,15 @@ def main(): log.debug('Saving sourcable %s hooks to %s', hook, options.script_filename) options.sourcing = True - output = open(options.script_filename, "w") try: - output.write('# %s\n' % hook) - # output.write('echo %s\n' % hook) - # output.write('set -x\n') - run_hooks(hook + '_source', options, args, output) - finally: - output.close() + with open(options.script_filename, "w") as output: + output.write('# %s\n' % hook) + # output.write('echo %s\n' % hook) + # output.write('set -x\n') + run_hooks(hook + '_source', options, args, output) + except (IOError, OSError) as e: + log.error('Error while writing to %s: \n %s', options.script_filename, e) + sys.exit(1) return 0 From 389610ec663399c084bf1c4f859f239234dbce6f Mon Sep 17 00:00:00 2001 From: Doug Hellmann Date: Thu, 21 Dec 2023 10:29:39 -0500 Subject: [PATCH 2/2] fix linter issue --- virtualenvwrapper/hook_loader.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/virtualenvwrapper/hook_loader.py b/virtualenvwrapper/hook_loader.py index cb2c865..7fd5177 100644 --- a/virtualenvwrapper/hook_loader.py +++ b/virtualenvwrapper/hook_loader.py @@ -153,7 +153,8 @@ def main(): # output.write('set -x\n') run_hooks(hook + '_source', options, args, output) except (IOError, OSError) as e: - log.error('Error while writing to %s: \n %s', options.script_filename, e) + log.error('Error while writing to %s: \n %s', + options.script_filename, e) sys.exit(1) return 0