simplify PYPY check (#703)

pyflakes/checker.py

@@ -23,11 +23,7 @@
 PY35_PLUS = sys.version_info >= (3, 5)    # Python 3.5 and above
 PY36_PLUS = sys.version_info >= (3, 6)    # Python 3.6 and above
 PY38_PLUS = sys.version_info >= (3, 8)
-try:
-    sys.pypy_version_info
-    PYPY = True
-except AttributeError:
-    PYPY = False
+PYPY = hasattr(sys, 'pypy_version_info')
 
 builtin_vars = dir(__import__('__builtin__' if PY2 else 'builtins'))
 

pyflakes/test/test_api.py

@@ -9,6 +9,7 @@
 import subprocess
 import tempfile
 
+from pyflakes.checker import PYPY
 from pyflakes.messages import UnusedImport
 from pyflakes.reporter import Reporter
 from pyflakes.api import (
@@ -25,12 +26,6 @@
     from io import StringIO
     unichr = chr
 
-try:
-    sys.pypy_version_info
-    PYPY = True
-except AttributeError:
-    PYPY = False
-
 ERROR_HAS_COL_NUM = ERROR_HAS_LAST_LINE = sys.version_info >= (3, 2) or PYPY
 
 

pyflakes/test/test_doctests.py

@@ -3,6 +3,7 @@
 
 from pyflakes import messages as m
 from pyflakes.checker import (
+    PYPY,
     DoctestScope,
     FunctionScope,
     ModuleScope,
@@ -12,12 +13,6 @@
 from pyflakes.test.test_undefined_names import Test as TestUndefinedNames
 from pyflakes.test.harness import TestCase, skip
 
-try:
-    sys.pypy_version_info
-    PYPY = True
-except AttributeError:
-    PYPY = False
-
 
 class _DoctestMixin(object):