Remove six library
This commit is contained in:
@@ -10,7 +10,7 @@ from xdist.scheduler import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
from six.moves.queue import Empty, Queue
|
from queue import Empty, Queue
|
||||||
|
|
||||||
|
|
||||||
class Interrupted(KeyboardInterrupt):
|
class Interrupted(KeyboardInterrupt):
|
||||||
|
|||||||
@@ -1,20 +1,9 @@
|
|||||||
import six
|
|
||||||
import py
|
import py
|
||||||
import pytest
|
import pytest
|
||||||
import execnet
|
import execnet
|
||||||
|
|
||||||
pytest_plugins = "pytester"
|
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)
|
@pytest.fixture(autouse=True)
|
||||||
def _divert_atexit(request, monkeypatch):
|
def _divert_atexit(request, monkeypatch):
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ from xdist.workermanage import WorkerController
|
|||||||
import execnet
|
import execnet
|
||||||
import marshal
|
import marshal
|
||||||
|
|
||||||
from six.moves.queue import Queue
|
from queue import Queue
|
||||||
|
|
||||||
WAIT_TIMEOUT = 10.0
|
WAIT_TIMEOUT = 10.0
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user