From: Mathieu Bridon <bochecha@daitauha.fr>
Date: Fri, 1 Jun 2018 13:02:21 +0000 (+0200)
Subject: python: Use open(), not file()
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8678fe537a5eeb9a537fc540672bf375e802c004;p=mesa.git

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@daitauha.fr>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
---

diff --git a/src/util/xmlpool/gen_xmlpool.py b/src/util/xmlpool/gen_xmlpool.py
index 886c1854f3a..b0db183854a 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)