From c8cb9ecef328a0bc68d591c9168b519b458d4a89 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Tue, 27 Aug 2019 09:56:32 +0100 Subject: [PATCH] minor logic tidy sacrifice accuracy for readability --- dvc/progress.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/dvc/progress.py b/dvc/progress.py index e921677db..7fd60969b 100644 --- a/dvc/progress.py +++ b/dvc/progress.py @@ -32,11 +32,14 @@ class Tqdm(tqdm): """ maximum-compatibility tqdm-based progressbars """ + BAR_FMT_DEFAULT = ( "{percentage:3.0f}%|{bar:10}|{desc} {bar:-10b}{n}/{total}" " [{elapsed}<{remaining}, {rate_fmt:>11}{postfix}]" ) - BAR_FMT_NOTOTAL = "{desc} {bar:b}{n} [{elapsed}11}{postfix}]" + BAR_FMT_NOTOTAL = ( + "{desc} {bar:b}{n} [{elapsed}11}{postfix}]" + ) def __init__( self, @@ -69,10 +72,10 @@ class Tqdm(tqdm): >= logging.CRITICAL ) if bar_format is None: - if kwargs.get('total', getattr(iterable, '__len__', None)) is None: - bar_format = self.BAR_FMT_NOTOTAL - else: + if kwargs.get("total", hasattr(iterable, "__len__")): bar_format = self.BAR_FMT_DEFAULT + else: + bar_format = self.BAR_FMT_NOTOTAL super(Tqdm, self).__init__( iterable=iterable, disable=disable,