Use six to import queue instead of py.builtin._tryimport
This commit is contained in:
parent
04f08b67a4
commit
ff19f273a9
|
@ -13,6 +13,7 @@ from _pytest._code.code import (
|
||||||
ReprExceptionInfo,
|
ReprExceptionInfo,
|
||||||
ExceptionChainRepr,
|
ExceptionChainRepr,
|
||||||
)
|
)
|
||||||
|
from six.moves import queue
|
||||||
|
|
||||||
from test_source import astonly
|
from test_source import astonly
|
||||||
|
|
||||||
|
@ -23,8 +24,6 @@ except ImportError:
|
||||||
else:
|
else:
|
||||||
invalidate_import_caches = getattr(importlib, "invalidate_caches", None)
|
invalidate_import_caches = getattr(importlib, "invalidate_caches", None)
|
||||||
|
|
||||||
queue = py.builtin._tryimport("queue", "Queue")
|
|
||||||
|
|
||||||
failsonjython = pytest.mark.xfail("sys.platform.startswith('java')")
|
failsonjython = pytest.mark.xfail("sys.platform.startswith('java')")
|
||||||
|
|
||||||
pytest_version_info = tuple(map(int, pytest.__version__.split(".")[:3]))
|
pytest_version_info = tuple(map(int, pytest.__version__.split(".")[:3]))
|
||||||
|
|
Loading…
Reference in New Issue