Sanitize the Python 2 check.

This broke for me on a project that has a module called 'builtins'. Let's just do a proper check using the normal `sys.version_info` API.
PyCQA · Dec 19, 2013 · 72263b4 · 72263b4
1 parent c57a450
commit 72263b4
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/pyflakes/checker.py b/pyflakes/checker.py
@@ -7,12 +7,13 @@
 import doctest
 import os
 import sys
-try:
-    builtin_vars = dir(__import__('builtins'))
-    PY2 = False
-except ImportError:
-    builtin_vars = dir(__import__('__builtin__'))
+
+if sys.version_info < (3, 0):
     PY2 = True
+    builtin_vars = dir(__import__('__builtin__'))
+else:
+    PY2 = False
+    builtin_vars = dir(__import__('builtins'))
 
 try:
     import ast