aboutsummaryrefslogtreecommitdiffstats
path: root/components/script/dom/bindings/codegen
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2015-08-21 09:30:06 -0600
committerbors-servo <metajack+bors@gmail.com>2015-08-21 09:30:06 -0600
commit3a48e04caffa4ba25854a4190883d1985845a359 (patch)
tree6b6b7843469d00fd7303ffa2b6251f6657c2edc4 /components/script/dom/bindings/codegen
parent7c45ff8e05a6ebd21f9aa5c360e997a01d48b1fc (diff)
parent2ab43bea5d508f41790339507ed439d2709c0bfa (diff)
downloadservo-3a48e04caffa4ba25854a4190883d1985845a359.tar.gz
servo-3a48e04caffa4ba25854a4190883d1985845a359.zip
Auto merge of #7305 - frewsxcv:python-context-managers, r=Ms2ger
Utilize Python context managers for opening/closing files In some of these cases, files were not being closed <!-- Reviewable:start --> [<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7305) <!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/bindings/codegen')
-rw-r--r--components/script/dom/bindings/codegen/BindingGen.py5
-rw-r--r--components/script/dom/bindings/codegen/CodegenRust.py10
-rw-r--r--components/script/dom/bindings/codegen/GenerateCSS2PropertiesWebIDL.py5
-rw-r--r--components/script/dom/bindings/codegen/GlobalGen.py10
4 files changed, 12 insertions, 18 deletions
diff --git a/components/script/dom/bindings/codegen/BindingGen.py b/components/script/dom/bindings/codegen/BindingGen.py
index f4d4fcdae2a..810f52db566 100644
--- a/components/script/dom/bindings/codegen/BindingGen.py
+++ b/components/script/dom/bindings/codegen/BindingGen.py
@@ -39,9 +39,8 @@ def main():
webIDLFile = os.path.normpath(args[2])
# Load the parsing results
- f = open('ParserResults.pkl', 'rb')
- parserData = cPickle.load(f)
- f.close()
+ with open('ParserResults.pkl', 'rb') as f:
+ parserData = cPickle.load(f)
# Create the configuration data.
config = Configuration(configFile, parserData)
diff --git a/components/script/dom/bindings/codegen/CodegenRust.py b/components/script/dom/bindings/codegen/CodegenRust.py
index cd3ee9baacb..b4ed22fb447 100644
--- a/components/script/dom/bindings/codegen/CodegenRust.py
+++ b/components/script/dom/bindings/codegen/CodegenRust.py
@@ -41,18 +41,16 @@ def replaceFileIfChanged(filename, newContents):
# oldFileContents = ""
# try:
- # oldFile = open(filename, 'rb')
- # oldFileContents = ''.join(oldFile.readlines())
- # oldFile.close()
+ # with open(filename, 'rb') as oldFile:
+ # oldFileContents = ''.join(oldFile.readlines())
# except:
# pass
# if newContents == oldFileContents:
# return False
- f = open(filename, 'wb')
- f.write(newContents)
- f.close()
+ with open(filename, 'wb') as f:
+ f.write(newContents)
return True
diff --git a/components/script/dom/bindings/codegen/GenerateCSS2PropertiesWebIDL.py b/components/script/dom/bindings/codegen/GenerateCSS2PropertiesWebIDL.py
index 55303f6c55b..37cde2702c5 100644
--- a/components/script/dom/bindings/codegen/GenerateCSS2PropertiesWebIDL.py
+++ b/components/script/dom/bindings/codegen/GenerateCSS2PropertiesWebIDL.py
@@ -18,9 +18,8 @@ for [prop, pref] in propList:
props += " [%s] attribute DOMString %s;\n" % (", ".join(extendedAttrs),
prop)
-idlFile = open(sys.argv[1], "r")
-idlTemplate = idlFile.read()
-idlFile.close()
+with open(sys.argv[1], "r") as idlFile:
+ idlTemplate = idlFile.read()
print ("/* THIS IS AN AUTOGENERATED FILE. DO NOT EDIT */\n\n" +
string.Template(idlTemplate).substitute({"props": props}))
diff --git a/components/script/dom/bindings/codegen/GlobalGen.py b/components/script/dom/bindings/codegen/GlobalGen.py
index 1bebc213e38..b3ed1e25b12 100644
--- a/components/script/dom/bindings/codegen/GlobalGen.py
+++ b/components/script/dom/bindings/codegen/GlobalGen.py
@@ -47,16 +47,14 @@ def main():
parser = WebIDL.Parser(options.cachedir)
for filename in fileList:
fullPath = os.path.normpath(os.path.join(baseDir, filename))
- f = open(fullPath, 'rb')
- lines = f.readlines()
- f.close()
+ with open(fullPath, 'rb') as f:
+ lines = f.readlines()
parser.parse(''.join(lines), fullPath)
parserResults = parser.finish()
# Write the parser results out to a pickle.
- resultsFile = open('ParserResults.pkl', 'wb')
- cPickle.dump(parserResults, resultsFile, -1)
- resultsFile.close()
+ with open('ParserResults.pkl', 'wb') as resultsFile:
+ cPickle.dump(parserResults, resultsFile, -1)
# Load the configuration.
config = Configuration(configFile, parserResults)