From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 863FD138350 for ; Mon, 13 Apr 2020 20:36:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C7D78E0C8E; Mon, 13 Apr 2020 20:36:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A31C5E0C4E for ; Mon, 13 Apr 2020 20:36:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8832034F29F for ; Mon, 13 Apr 2020 20:36:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B7C5C1DC for ; Mon, 13 Apr 2020 20:36:02 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1586810135.2fb8d95e7c83a6e2123e9575f9fd253aae962b43.mattst88@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/base/, catalyst/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/base/resume.py catalyst/base/stagebase.py catalyst/fileops.py X-VCS-Directories: catalyst/ catalyst/base/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 2fb8d95e7c83a6e2123e9575f9fd253aae962b43 X-VCS-Branch: master Date: Mon, 13 Apr 2020 20:36:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 363b6a58-9e62-4a2c-a87c-143174c47f10 X-Archives-Hash: 574df175e58446a2164e594728f8da86 commit: 2fb8d95e7c83a6e2123e9575f9fd253aae962b43 Author: Matt Turner gentoo org> AuthorDate: Sat Apr 11 22:30:03 2020 +0000 Commit: Matt Turner gentoo org> CommitDate: Mon Apr 13 20:35:35 2020 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=2fb8d95e catalyst: Just import things where they're needed Signed-off-by: Matt Turner gentoo.org> catalyst/base/resume.py | 3 ++- catalyst/base/stagebase.py | 3 ++- catalyst/fileops.py | 7 +------ 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/catalyst/base/resume.py b/catalyst/base/resume.py index a0770b9d..82f97cd3 100644 --- a/catalyst/base/resume.py +++ b/catalyst/base/resume.py @@ -9,9 +9,10 @@ set, unset, is_set, is_unset, enabled, clear_all import os from snakeoil import fileutils +from snakeoil.osutils import pjoin, listdir_files from catalyst import log -from catalyst.fileops import ensure_dirs, pjoin, listdir_files, clear_dir +from catalyst.fileops import ensure_dirs, clear_dir class AutoResume(): diff --git a/catalyst/base/stagebase.py b/catalyst/base/stagebase.py index a90fc843..683e5989 100644 --- a/catalyst/base/stagebase.py +++ b/catalyst/base/stagebase.py @@ -5,6 +5,7 @@ import shutil import sys from snakeoil import fileutils +from snakeoil.osutils import pjoin from DeComp.compress import CompressMap @@ -17,7 +18,7 @@ from catalyst.base.targetbase import TargetBase from catalyst.base.clearbase import ClearBase from catalyst.base.genbase import GenBase from catalyst.lock import LockDir, LockInUse -from catalyst.fileops import ensure_dirs, pjoin, clear_dir, clear_path +from catalyst.fileops import ensure_dirs, clear_dir, clear_path from catalyst.base.resume import AutoResume diff --git a/catalyst/fileops.py b/catalyst/fileops.py index fffcfc6a..671d8d9f 100644 --- a/catalyst/fileops.py +++ b/catalyst/fileops.py @@ -10,12 +10,7 @@ import os import shutil from stat import ST_UID, ST_GID, ST_MODE -# NOTE: pjoin and listdir_files are imported here for export -# to other catalyst modules -# pylint: disable=unused-import -from snakeoil.osutils import (ensure_dirs as snakeoil_ensure_dirs, - pjoin, listdir_files) -# pylint: enable=unused-import +from snakeoil.osutils import ensure_dirs as snakeoil_ensure_dirs from catalyst import log from catalyst.support import CatalystError