diff options
| -rw-r--r-- | pyflakes/checker.py | 6 | ||||
| -rw-r--r-- | pyflakes/test/test_api.py | 7 | ||||
| -rw-r--r-- | pyflakes/test/test_doctests.py | 7 |
3 files changed, 3 insertions, 17 deletions
diff --git a/pyflakes/checker.py b/pyflakes/checker.py index 07c103c..0da87c2 100644 --- a/pyflakes/checker.py +++ b/pyflakes/checker.py @@ -23,11 +23,7 @@ PY2 = sys.version_info < (3, 0) 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')) diff --git a/pyflakes/test/test_api.py b/pyflakes/test/test_api.py index 9c81161..3d93591 100644 --- a/pyflakes/test/test_api.py +++ b/pyflakes/test/test_api.py @@ -9,6 +9,7 @@ import shutil 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 @@ else: 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 diff --git a/pyflakes/test/test_doctests.py b/pyflakes/test/test_doctests.py index 836b248..de796b9 100644 --- a/pyflakes/test/test_doctests.py +++ b/pyflakes/test/test_doctests.py @@ -3,6 +3,7 @@ import textwrap from pyflakes import messages as m from pyflakes.checker import ( + PYPY, DoctestScope, FunctionScope, ModuleScope, @@ -12,12 +13,6 @@ from pyflakes.test.test_imports import Test as TestImports 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): |