From ff19f273a9cc04271c17e81d74eec9bc8e2410ef Mon Sep 17 00:00:00 2001 From: Anthony Sottile Date: Sun, 3 Jun 2018 11:57:53 -0700 Subject: [PATCH] Use six to import queue instead of py.builtin._tryimport --- testing/code/test_excinfo.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/testing/code/test_excinfo.py b/testing/code/test_excinfo.py index 463b2e38e..f4044b6ec 100644 --- a/testing/code/test_excinfo.py +++ b/testing/code/test_excinfo.py @@ -13,6 +13,7 @@ from _pytest._code.code import ( ReprExceptionInfo, ExceptionChainRepr, ) +from six.moves import queue from test_source import astonly @@ -23,8 +24,6 @@ except ImportError: else: invalidate_import_caches = getattr(importlib, "invalidate_caches", None) -queue = py.builtin._tryimport("queue", "Queue") - failsonjython = pytest.mark.xfail("sys.platform.startswith('java')") pytest_version_info = tuple(map(int, pytest.__version__.split(".")[:3]))