Improve granularity of Unicode error handler

1 files changed, 12 insertions, 13 deletions

diff --git a/pyflakes/api.py b/pyflakes/api.py
index 17a9257..b132566 100644
--- a/pyflakes/api.py
+++ b/pyflakes/api.py
@@ -1,6 +1,7 @@
 """
 API for the command-line I{pyflakes} tool.
 """
+from __future__ import with_statement
 
 import sys
 import os
@@ -53,13 +54,12 @@ def check(codeString, filename, reporter=None):
     except Exception:
         reporter.unexpectedError(filename, 'problem decoding source')
         return 1
-    else:
-        # Okay, it's syntactically valid.  Now check it.
-        w = checker.Checker(tree, filename)
-        w.messages.sort(key=lambda m: m.lineno)
-        for warning in w.messages:
-            reporter.flake(warning)
-        return len(w.messages)
+    # Okay, it's syntactically valid.  Now check it.
+    w = checker.Checker(tree, filename)
+    w.messages.sort(key=lambda m: m.lineno)
+    for warning in w.messages:
+        reporter.flake(warning)
+    return len(w.messages)
 
 
 def checkPath(filename, reporter=None):
@@ -74,17 +74,16 @@ def checkPath(filename, reporter=None):
     if reporter is None:
         reporter = modReporter._makeDefaultReporter()
     try:
-        f = open(filename, 'U')
-        try:
-            return check(f.read() + '\n', filename, reporter)
-        finally:
-            f.close()
+        with open(filename, 'U') as f:
+            codestr = f.read() + '\n'
     except UnicodeError:
         reporter.unexpectedError(filename, 'problem decoding source')
+        return 1
     except IOError:
         msg = sys.exc_info()[1]
         reporter.unexpectedError(filename, msg.args[1])
-    return 1
+        return 1
+    return check(codestr, filename, reporter)
 
 
 def iterSourceCode(paths):