Mesa (master): python: Use open(), not file()
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Wed Aug 1 13:57:23 UTC 2018
Module: Mesa
Branch: master
Commit: 8678fe537a5eeb9a537fc540672bf375e802c004
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=8678fe537a5eeb9a537fc540672bf375e802c004
Author: Mathieu Bridon <bochecha at daitauha.fr>
Date: Fri Jun 1 15:02:21 2018 +0200
python: Use open(), not file()
The latter is a constructor for file objects, but when actually opening
a file, using the former is more idiomatic.
In addition, file() is not a builtin any more in Python 3, so this makes
the script compatible with both Python 2 and Python 3.
Signed-off-by: Mathieu Bridon <bochecha at daitauha.fr>
Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>
---
src/util/xmlpool/gen_xmlpool.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/util/xmlpool/gen_xmlpool.py b/src/util/xmlpool/gen_xmlpool.py
index 886c1854f3..b0db183854 100644
--- a/src/util/xmlpool/gen_xmlpool.py
+++ b/src/util/xmlpool/gen_xmlpool.py
@@ -168,7 +168,7 @@ print("/***********************************************************************\
# Process the options template and generate options.h with all
# translations.
-template = file (template_header_path, "r")
+template = open (template_header_path, "r")
descMatches = []
for line in template:
if len(descMatches) > 0:
@@ -199,6 +199,8 @@ for line in template:
else:
print(line, end='')
+template.close()
+
if len(descMatches) > 0:
sys.stderr.write ("Warning: unterminated description at end of file.\n")
expandMatches (descMatches, translations)
More information about the mesa-commit
mailing list