From 19acded31f73a7853165a82016bf0f9f6064a9c1 Mon Sep 17 00:00:00 2001 From: Ruslan Kuprieiev Date: Fri, 17 Jan 2020 11:51:40 +0200 Subject: [PATCH] logger: utils: fs: use lazy formatting --- dvc/rwlock.py | 2 +- dvc/utils/fs.py | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/dvc/rwlock.py b/dvc/rwlock.py index d0665483c..d805bcd55 100644 --- a/dvc/rwlock.py +++ b/dvc/rwlock.py @@ -9,7 +9,7 @@ from funcy.py3 import lmap, lfilter, lmapcat from .exceptions import DvcException from .lock import LockError -from .utils.fs import relpath +from .utils import relpath INFO_SCHEMA = {"pid": int, "cmd": str} diff --git a/dvc/utils/fs.py b/dvc/utils/fs.py index 56f3c9975..aef055235 100644 --- a/dvc/utils/fs.py +++ b/dvc/utils/fs.py @@ -13,7 +13,6 @@ from dvc.system import System from dvc.utils import dict_md5 from dvc.utils import fspath from dvc.utils import fspath_py35 -from dvc.utils import relpath logger = logging.getLogger(__name__) @@ -30,7 +29,7 @@ def fs_copy(src, dst): def get_inode(path): inode = System.inode(path) - logger.debug("Path {} inode {}".format(path, inode)) + logger.debug("Path {} inode {}", path, inode) return inode @@ -131,10 +130,9 @@ def _chmod(func, p, excinfo): def remove(path): + logger.debug("Removing '{}'", path) + path = fspath_py35(path) - - logger.debug("Removing '{}'".format(relpath(path))) - try: if os.path.isdir(path): shutil.rmtree(path, onerror=_chmod)