commit: 2fb8d95e7c83a6e2123e9575f9fd253aae962b43 Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> AuthorDate: Sat Apr 11 22:30:03 2020 +0000 Commit: Matt Turner <mattst88 <AT> gentoo <DOT> 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 <mattst88 <AT> 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
