From 38311dc2005f0ed1e21d71dc0b6994c69bfb7591 Mon Sep 17 00:00:00 2001 From: Stu Hood Date: Tue, 12 Mar 2019 23:27:47 -0700 Subject: [PATCH] Replace `future` with `six` in the python style checker. (#7374) ### Problem The workaround for #7158 was to remove usage of `future` in the python style `checker` pex, but documentation was not left behind to defend against re-addition, and so it regressed. ### Solution Switch from `future` to `six`, and add a comment. ### Result Checking py3 code from within a py2 pex should work. --- .../src/python/pants/contrib/python/checks/checker/BUILD | 3 ++- .../pants/contrib/python/checks/checker/constant_logic.py | 2 +- .../pants/contrib/python/checks/checker/except_statements.py | 2 +- .../contrib/python/checks/checker/missing_contextmanager.py | 2 +- .../pants/contrib/python/checks/checker/print_statements.py | 2 +- 5 files changed, 6 insertions(+), 5 deletions(-) diff --git a/contrib/python/src/python/pants/contrib/python/checks/checker/BUILD b/contrib/python/src/python/pants/contrib/python/checks/checker/BUILD index 0d326a8c184..e5e8a3e39a4 100644 --- a/contrib/python/src/python/pants/contrib/python/checks/checker/BUILD +++ b/contrib/python/src/python/pants/contrib/python/checks/checker/BUILD @@ -10,7 +10,8 @@ python_library( } ), dependencies=[ - '3rdparty/python:future', + # NB: See https://github.com/pantsbuild/pants/issues/7158 before introducing additional + # dependencies here. '3rdparty/python:pycodestyle', '3rdparty/python:pyflakes', '3rdparty/python:six', diff --git a/contrib/python/src/python/pants/contrib/python/checks/checker/constant_logic.py b/contrib/python/src/python/pants/contrib/python/checks/checker/constant_logic.py index f653fa72f76..8087d88fcd9 100644 --- a/contrib/python/src/python/pants/contrib/python/checks/checker/constant_logic.py +++ b/contrib/python/src/python/pants/contrib/python/checks/checker/constant_logic.py @@ -6,7 +6,7 @@ import ast -from future.utils import PY3 +from six import PY3 from pants.contrib.python.checks.checker.common import CheckstylePlugin diff --git a/contrib/python/src/python/pants/contrib/python/checks/checker/except_statements.py b/contrib/python/src/python/pants/contrib/python/checks/checker/except_statements.py index 8be63af8bbd..97a16557746 100644 --- a/contrib/python/src/python/pants/contrib/python/checks/checker/except_statements.py +++ b/contrib/python/src/python/pants/contrib/python/checks/checker/except_statements.py @@ -6,7 +6,7 @@ import ast -from future.utils import PY3 +from six import PY3 from pants.contrib.python.checks.checker.common import CheckstylePlugin diff --git a/contrib/python/src/python/pants/contrib/python/checks/checker/missing_contextmanager.py b/contrib/python/src/python/pants/contrib/python/checks/checker/missing_contextmanager.py index 8d90fcce6d5..64587669730 100644 --- a/contrib/python/src/python/pants/contrib/python/checks/checker/missing_contextmanager.py +++ b/contrib/python/src/python/pants/contrib/python/checks/checker/missing_contextmanager.py @@ -6,7 +6,7 @@ import ast -from future.utils import PY3 +from six import PY3 from pants.contrib.python.checks.checker.common import CheckstylePlugin diff --git a/contrib/python/src/python/pants/contrib/python/checks/checker/print_statements.py b/contrib/python/src/python/pants/contrib/python/checks/checker/print_statements.py index 9b263d07d75..78546f5fdc8 100644 --- a/contrib/python/src/python/pants/contrib/python/checks/checker/print_statements.py +++ b/contrib/python/src/python/pants/contrib/python/checks/checker/print_statements.py @@ -7,7 +7,7 @@ import ast import re -from future.utils import PY3 +from six import PY3 from pants.contrib.python.checks.checker.common import CheckstylePlugin