From 6de48d30edb6df8384405c8aa8bed0214607b251 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Thu, 16 Jan 2020 20:47:23 +0000 Subject: [PATCH] replace funcy.merge with py3 syntax --- dvc/progress.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dvc/progress.py b/dvc/progress.py index 25e22fbb0d..d03b037c06 100644 --- a/dvc/progress.py +++ b/dvc/progress.py @@ -4,7 +4,6 @@ import sys from threading import RLock -from funcy import merge from tqdm import tqdm from dvc.utils import env2bool @@ -63,7 +62,7 @@ def __init__( """ kwargs = kwargs.copy() if bytes: - kwargs = merge(self.BYTES_DEFAULTS, kwargs) + kwargs = {**self.BYTES_DEFAULTS, **kwargs} else: kwargs.setdefault("unit_scale", total > 999 if total else True) if file is None: