From ad6714ff1671c1e02195d001c99e46a330c2cf45 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Fri, 19 Jun 2015 12:04:55 +0100 Subject: [PATCH 1/2] mailmap to merge duplicate auth entries --- .mailmap | 1 + 1 file changed, 1 insertion(+) create mode 100644 .mailmap diff --git a/.mailmap b/.mailmap new file mode 100644 index 00000000..347e524b --- /dev/null +++ b/.mailmap @@ -0,0 +1 @@ +Noam Yorav-Raphael From aa18f56ef0b480af04baf9c2a5a2ef67e9be39fb Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Fri, 19 Jun 2015 12:06:11 +0100 Subject: [PATCH 2/2] stdout and miniter bugfix, more tests with better output --- tqdm/_tqdm.py | 4 ++-- tqdm/tests/tests_tqdm.py | 19 ++++++++++++++++--- 2 files changed, 18 insertions(+), 5 deletions(-) diff --git a/tqdm/_tqdm.py b/tqdm/_tqdm.py index e3da1a7d..3c616a17 100644 --- a/tqdm/_tqdm.py +++ b/tqdm/_tqdm.py @@ -203,7 +203,7 @@ def tqdm(iterable, desc=None, total=None, leave=False, file=sys.stderr, sp.print_status(format_meter( n, total, cur_t-start_t, ncols, prefix, ascii)) if dynamic_miniters: - miniters = max(miniters, n - last_print_n + 1) + miniters = max(miniters, n - last_print_n) last_print_n = n last_print_t = cur_t @@ -215,7 +215,7 @@ def tqdm(iterable, desc=None, total=None, leave=False, file=sys.stderr, file.write('\n') else: sp.print_status('') - sys.stdout.write('\r') + file.write('\r') def trange(*args, **kwargs): diff --git a/tqdm/tests/tests_tqdm.py b/tqdm/tests/tests_tqdm.py index 093bc258..004c1d9f 100644 --- a/tqdm/tests/tests_tqdm.py +++ b/tqdm/tests/tests_tqdm.py @@ -39,10 +39,11 @@ def test_format_meter(): " | 231/1000 [06:32<21:44, 0.59 it/s]" -def test_nothing_fails(): - """ Just make sure we're able to iterate using tqdm """ +def test_all_defaults(): for i in tqdm(range(10)): pass + import sys + sys.stderr.write('tests_tqdm.test_all_defaults ... ') def test_iterate_over_csv_rows(): @@ -55,8 +56,10 @@ def test_iterate_over_csv_rows(): # Test that nothing fails if we iterate over rows reader = csv.DictReader(test_csv_file, fieldnames=('row1', 'row2', 'row3')) - for row in tqdm(reader): + our_file = StringIO() + for row in tqdm(reader, file=our_file): pass + our_file.close() def test_file_output(): @@ -110,6 +113,7 @@ def test_min_interval(): pass our_file.seek(0) assert " 0%| | 0/3 [00:00<" in our_file.read() + our_file.close() def test_min_iters(): @@ -118,6 +122,15 @@ def test_min_iters(): our_file.write('blank\n') our_file.seek(0) assert '\nblank\nblank\n' in our_file.read() + our_file.close() + + our_file2 = StringIO() + for i in tqdm(range(3), file=our_file2, leave=True, miniters=1): + our_file2.write('blank\n') + our_file2.seek(0) + # assume mininterval = 0.1 means no intermediate output + assert '\nblank\nblank\n' in our_file2.read() + our_file2.close() def test_disable():