From 8618d322e00f88b7b5528abfc75b26c162032a21 Mon Sep 17 00:00:00 2001 From: Joel Holdsworth Date: Thu, 16 Dec 2021 13:46:15 +0000 Subject: [PATCH] git-p4: use with statements to close files after use in patchRCSKeywords Python with statements are used to wrap the execution of a block of code so that an object can be safely released when execution leaves the scope. They are desirable for improving code tidyness, and to ensure that objects are properly destroyed even when exceptions are thrown. Signed-off-by: Joel Holdsworth Signed-off-by: Junio C Hamano --- git-p4.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/git-p4.py b/git-p4.py index 2b4500226a..226cdef424 100755 --- a/git-p4.py +++ b/git-p4.py @@ -1757,14 +1757,11 @@ class P4Submit(Command, P4UserMap): # Attempt to zap the RCS keywords in a p4 controlled file matching the given pattern (handle, outFileName) = tempfile.mkstemp(dir='.') try: - outFile = os.fdopen(handle, "w+") - inFile = open(file, "r") - regexp = re.compile(pattern, re.VERBOSE) - for line in inFile.readlines(): - line = regexp.sub(r'$\1$', line) - outFile.write(line) - inFile.close() - outFile.close() + with os.fdopen(handle, "w+") as outFile, open(file, "r") as inFile: + regexp = re.compile(pattern, re.VERBOSE) + for line in inFile.readlines(): + line = regexp.sub(r'$\1$', line) + outFile.write(line) # Forcibly overwrite the original file os.unlink(file) shutil.move(outFileName, file)