From 805be64769c077ccd98026980b562f90ef6898c0 Mon Sep 17 00:00:00 2001 From: David Stainton Date: Mon, 9 Jan 2017 17:58:41 +0000 Subject: [PATCH] Use `which` from twisted fixes #2856 --- integration/conftest.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration/conftest.py b/integration/conftest.py index c1c31bc7a..e92e3eb5a 100644 --- a/integration/conftest.py +++ b/integration/conftest.py @@ -6,8 +6,8 @@ from sys import stdout as _stdout from os import mkdir, listdir, unlink from os.path import join, abspath, curdir, exists from tempfile import mkdtemp, mktemp -from shutilwhich import which +from twisted.python.procutils import which from twisted.internet.defer import Deferred, DeferredList from twisted.internet.task import deferLater from twisted.internet.error import ProcessExitedAlready