From dddac7c7e9fcc176508592dd3dbd7d437336a885 Mon Sep 17 00:00:00 2001 From: Hugo Date: Sat, 11 Jul 2020 16:17:20 +0300 Subject: [PATCH] Remove six library --- src/xdist/dsession.py | 2 +- testing/conftest.py | 11 ----------- testing/test_remote.py | 2 +- 3 files changed, 2 insertions(+), 13 deletions(-) diff --git a/src/xdist/dsession.py b/src/xdist/dsession.py index 8ea245c..d7ccb8c 100644 --- a/src/xdist/dsession.py +++ b/src/xdist/dsession.py @@ -10,7 +10,7 @@ from xdist.scheduler import ( ) -from six.moves.queue import Empty, Queue +from queue import Empty, Queue class Interrupted(KeyboardInterrupt): diff --git a/testing/conftest.py b/testing/conftest.py index 43c0399..52f0308 100644 --- a/testing/conftest.py +++ b/testing/conftest.py @@ -1,20 +1,9 @@ -import six import py import pytest import execnet pytest_plugins = "pytester" -if six.PY2: - - @pytest.fixture(scope="session", autouse=True) - def _ensure_imports(): - # we import some modules because pytest-2.8's testdir fixture - # will unload all modules after each test and this cause - # (unknown) problems with execnet.Group() - execnet.Group - execnet.makegateway - @pytest.fixture(autouse=True) def _divert_atexit(request, monkeypatch): diff --git a/testing/test_remote.py b/testing/test_remote.py index e223a66..da2f6a8 100644 --- a/testing/test_remote.py +++ b/testing/test_remote.py @@ -8,7 +8,7 @@ from xdist.workermanage import WorkerController import execnet import marshal -from six.moves.queue import Queue +from queue import Queue WAIT_TIMEOUT = 10.0