From 167dfc6ce7f7190d2c1c72af1b3be97f5fafba95 Mon Sep 17 00:00:00 2001 From: Brett Smith Date: Fri, 2 Feb 2024 01:23:43 -0500 Subject: [PATCH] 21417: Clean arv-keepdocker imports Arvados-DCO-1.1-Signed-off-by: Brett Smith --- sdk/python/arvados/commands/keepdocker.py | 17 ++++++----------- sdk/python/tests/test_arv_keepdocker.py | 5 +---- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/sdk/python/arvados/commands/keepdocker.py b/sdk/python/arvados/commands/keepdocker.py index 7b7367080f..a8b1dab5a8 100644 --- a/sdk/python/arvados/commands/keepdocker.py +++ b/sdk/python/arvados/commands/keepdocker.py @@ -2,34 +2,29 @@ # # SPDX-License-Identifier: Apache-2.0 -from builtins import next import argparse import collections import datetime import errno +import fcntl import json +import logging import os import re +import subprocess import sys import tarfile import tempfile -import shutil -import _strptime -import fcntl + +import ciso8601 from operator import itemgetter from stat import * -import subprocess - import arvados +import arvados.config import arvados.util import arvados.commands._util as arv_cmd import arvados.commands.put as arv_put -from arvados.collection import CollectionReader -import ciso8601 -import logging -import arvados.config - from arvados._version import __version__ logger = logging.getLogger('arvados.keepdocker') diff --git a/sdk/python/tests/test_arv_keepdocker.py b/sdk/python/tests/test_arv_keepdocker.py index 526fd68727..50a92b3e60 100644 --- a/sdk/python/tests/test_arv_keepdocker.py +++ b/sdk/python/tests/test_arv_keepdocker.py @@ -2,23 +2,20 @@ # # SPDX-License-Identifier: Apache-2.0 -from __future__ import absolute_import import arvados import collections import copy import hashlib +import logging import mock import os import subprocess import sys import tempfile import unittest -import logging import arvados.commands.keepdocker as arv_keepdocker from . import arvados_testutil as tutil -from . import run_test_server - class StopTest(Exception): pass -- 2.30.2