From 86605b6fa6d98237d5f069c468cdfb84601d0ef4 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Tue, 27 Aug 2019 13:41:12 +0100 Subject: [PATCH] use funcy --- dvc/progress.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/dvc/progress.py b/dvc/progress.py index e0a00944c..ffef29255 100644 --- a/dvc/progress.py +++ b/dvc/progress.py @@ -3,6 +3,7 @@ from __future__ import print_function import logging from tqdm import tqdm from concurrent.futures import ThreadPoolExecutor +from funcy import merge logger = logging.getLogger(__name__) @@ -69,10 +70,10 @@ class Tqdm(tqdm): kwargs = kwargs.copy() kwargs.setdefault("unit_scale", True) if bytes: - for k, v in dict( - unit="B", unit_scale=True, unit_divisor=1024, miniters=1 - ).items(): - kwargs.setdefault(k, v) + kwargs = merge( + dict(unit="B", unit_scale=True, unit_divisor=1024, miniters=1), + kwargs, + ) self.desc_persist = desc if desc_truncate is not None: desc = self.truncate(desc_truncate)