[Python-checkins] cpython: Cleanup findnocoding.py and pysource.py scripts (with infile/infile.close)

[victor.stinner]

http://hg.python.org/cpython/rev/8ace059cdffd
changeset:   78376:8ace059cdffd
user:        Victor Stinner <victor.stinner at gmail.com>
date:        Thu Aug 02 00:05:41 2012 +0200
summary:
  Cleanup findnocoding.py and pysource.py scripts (with infile/infile.close)

files:
  Tools/scripts/findnocoding.py |  1 -
  Tools/scripts/pysource.py     |  8 ++++----
  2 files changed, 4 insertions(+), 5 deletions(-)


diff --git a/Tools/scripts/findnocoding.py b/Tools/scripts/findnocoding.py
--- a/Tools/scripts/findnocoding.py
+++ b/Tools/scripts/findnocoding.py
@@ -60,7 +60,6 @@
 
         if get_declaration(line1) or get_declaration(line2):
             # the file does have an encoding declaration, so trust it
-            infile.close()
             return False
 
         # check the whole file for non utf-8 characters
diff --git a/Tools/scripts/pysource.py b/Tools/scripts/pysource.py
--- a/Tools/scripts/pysource.py
+++ b/Tools/scripts/pysource.py
@@ -55,8 +55,8 @@
     if infile is None:
         return False
 
-    line = infile.readline()
-    infile.close()
+    with infile:
+        line = infile.readline()
 
     if binary_re.search(line):
         # file appears to be binary
@@ -76,8 +76,8 @@
     if infile is None:
         return False
 
-    code = infile.read()
-    infile.close()
+    with infile:
+        code = infile.read()
 
     try:
         compile(code, fullpath, "exec")

-- 
Repository URL: http://hg.python.org/cpython