[Python-checkins] r70468 - python/trunk/Lib/filecmp.py

[benjamin.peterson]

Author: benjamin.peterson
Date: Thu Mar 19 04:04:31 2009
New Revision: 70468

Log:
close files after comparing them

Modified:
   python/trunk/Lib/filecmp.py

Modified: python/trunk/Lib/filecmp.py
==============================================================================
--- python/trunk/Lib/filecmp.py	(original)
+++ python/trunk/Lib/filecmp.py	Thu Mar 19 04:04:31 2009
@@ -11,6 +11,7 @@
 
 import os
 import stat
+import contextlib
 from itertools import ifilter, ifilterfalse, imap, izip
 
 __all__ = ["cmp","dircmp","cmpfiles"]
@@ -62,15 +63,14 @@
 
 def _do_cmp(f1, f2):
     bufsize = BUFSIZE
-    fp1 = open(f1, 'rb')
-    fp2 = open(f2, 'rb')
-    while True:
-        b1 = fp1.read(bufsize)
-        b2 = fp2.read(bufsize)
-        if b1 != b2:
-            return False
-        if not b1:
-            return True
+    with contextlib.nested(open(f1, 'rb'), open(f2, 'rb')) as (fp1, fp2):
+        while True:
+            b1 = fp1.read(bufsize)
+            b2 = fp2.read(bufsize)
+            if b1 != b2:
+                return False
+            if not b1:
+                return True
 
 # Directory comparison class.
 #