From 8cd2b7477b1e58cdace3ebcffc343d45a1f4b729 Mon Sep 17 00:00:00 2001 From: Ned Batchelder Date: Sun, 26 Oct 2014 10:34:56 -0400 Subject: Use with-open everywhere --- igor.py | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'igor.py') diff --git a/igor.py b/igor.py index 6c1c5d1..4df94cf 100644 --- a/igor.py +++ b/igor.py @@ -168,18 +168,19 @@ def do_check_eol(): checked.add(fname) line = None - for n, line in enumerate(open(fname, "rb"), start=1): - if crlf: - if "\r" in line: - print("%s@%d: CR found" % (fname, n)) - return - if trail_white: - line = line[:-1] - if not crlf: - line = line.rstrip('\r') - if line.rstrip() != line: - print("%s@%d: trailing whitespace found" % (fname, n)) - return + with open(fname, "rb") as f: + for n, line in enumerate(f, start=1): + if crlf: + if "\r" in line: + print("%s@%d: CR found" % (fname, n)) + return + if trail_white: + line = line[:-1] + if not crlf: + line = line.rstrip('\r') + if line.rstrip() != line: + print("%s@%d: trailing whitespace found" % (fname, n)) + return if line is not None and not line.strip(): print("%s: final blank line" % (fname,)) -- cgit v1.2.1