Skip to content

Commit

Permalink
replace funcy.merge with py3 syntax
Browse files Browse the repository at this point in the history
  • Loading branch information
casperdcl committed Jan 26, 2020
1 parent 528dedd commit 6de48d3
Showing 1 changed file with 1 addition and 2 deletions.
3 changes: 1 addition & 2 deletions dvc/progress.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import sys
from threading import RLock

from funcy import merge
from tqdm import tqdm

from dvc.utils import env2bool
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 6de48d3

Please sign in to comment.