From: Kyr Shatskyy Date: Thu, 14 Nov 2019 23:37:52 +0000 (+0100) Subject: lock/ops: use module full path for py3 compat X-Git-Tag: 1.1.0~188^2~2 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=bcd608349ca7c007e197b27a78f42a4ccb2ce717;p=teuthology.git lock/ops: use module full path for py3 compat Signed-off-by: Kyr Shatskyy --- diff --git a/teuthology/lock/ops.py b/teuthology/lock/ops.py index d5fbf092b..fc4aed9d6 100644 --- a/teuthology/lock/ops.py +++ b/teuthology/lock/ops.py @@ -13,8 +13,8 @@ from teuthology.contextutil import safe_while from teuthology.task import console_log from teuthology.misc import canonicalize_hostname -import util -import keys +from teuthology.lock import util +from teuthology.lock import keys log = logging.getLogger(__name__) diff --git a/teuthology/orchestra/remote.py b/teuthology/orchestra/remote.py index 2fae5a6d6..3af65e283 100644 --- a/teuthology/orchestra/remote.py +++ b/teuthology/orchestra/remote.py @@ -5,6 +5,7 @@ import teuthology.lock.query import teuthology.lock.util from teuthology.orchestra import run from teuthology.orchestra import connection +from teuthology.orchestra import console from teuthology.orchestra.opsys import OS from teuthology import misc from teuthology.exceptions import CommandFailedError @@ -18,8 +19,6 @@ import pwd import tempfile import netaddr -import console - log = logging.getLogger(__name__)