[llvm] r372876 - [gn build] Fix Python DeprecationWarning
Marco Antognini via llvm-commits
llvm-commits at lists.llvm.org
Wed Sep 25 07:15:34 PDT 2019
Author: mantognini
Date: Wed Sep 25 07:15:34 2019
New Revision: 372876
URL: http://llvm.org/viewvc/llvm-project?rev=372876&view=rev
Log:
[gn build] Fix Python DeprecationWarning
Summary:
This fixes two issues:
- DeprecationWarning: invalid escape sequence \`
- ResourceWarning: unclosed file
Subscribers: mgorny, llvm-commits
Tags: #llvm
Differential Revision: https://reviews.llvm.org/D67753
Modified:
llvm/trunk/utils/gn/build/write_cmake_config.py
Modified: llvm/trunk/utils/gn/build/write_cmake_config.py
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/gn/build/write_cmake_config.py?rev=372876&r1=372875&r2=372876&view=diff
==============================================================================
--- llvm/trunk/utils/gn/build/write_cmake_config.py (original)
+++ llvm/trunk/utils/gn/build/write_cmake_config.py Wed Sep 25 07:15:34 2019
@@ -1,5 +1,5 @@
#!/usr/bin/env python
-"""Emulates the bits of CMake's configure_file() function needed in LLVM.
+r"""Emulates the bits of CMake's configure_file() function needed in LLVM.
The CMake build uses configure_file() for several things. This emulates that
function for the GN build. In the GN build, this runs at build time instead
@@ -62,7 +62,8 @@ def main():
# Matches e.g. '${FOO}' or '@FOO@' and captures FOO in group 1 or 2.
var_re = re.compile(r'\$\{([^}]*)\}|@([^@]*)@')
- in_lines = open(args.input).readlines()
+ with open(args.input) as f:
+ in_lines = f.readlines()
out_lines = []
for in_line in in_lines:
def repl(m):
@@ -102,8 +103,13 @@ def main():
file=sys.stderr)
return 1
- if not os.path.exists(args.output) or open(args.output).read() != output:
- open(args.output, 'w').write(output)
+ def read(filename):
+ with open(args.output) as f:
+ return f.read()
+
+ if not os.path.exists(args.output) or read(args.output) != output:
+ with open(args.output, 'w') as f:
+ f.write(output)
os.chmod(args.output, os.stat(args.input).st_mode & 0o777)
More information about the llvm-commits
mailing list