From 99a7c678462ef0d0f006541066677195af93db86 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Sun, 10 Jan 2021 17:10:22 +0000 Subject: [PATCH] tk & gui: fix `disply()` inheritance --- tqdm/gui.py | 4 ++-- tqdm/tk.py | 13 +++++-------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/tqdm/gui.py b/tqdm/gui.py index 0d8714b2..396e4af8 100644 --- a/tqdm/gui.py +++ b/tqdm/gui.py @@ -113,7 +113,7 @@ class tqdm_gui(std_tqdm): # pragma: no cover def clear(self, *_, **__): pass - def display(self): + def display(self, *_, **__): n = self.n cur_t = self._time() elapsed = cur_t - self.start_t @@ -172,7 +172,7 @@ class tqdm_gui(std_tqdm): # pragma: no cover line2.set_data(t_ago, zdata) d = self.format_dict - d['ncols'] = 0 + d['ncols'] = 0 # remove bar ax.set_title(self.format_meter(**d), fontname="DejaVu Sans Mono", fontsize=11) self.plt.pause(1e-9) diff --git a/tqdm/tk.py b/tqdm/tk.py index f8bb93e5..e36e92b8 100644 --- a/tqdm/tk.py +++ b/tqdm/tk.py @@ -81,7 +81,7 @@ class tqdm_tk(std_tqdm): # pragma: no cover else: self._tk_window = tkinter.Toplevel(tk_parent) - warn('GUI is experimental/alpha', TqdmExperimentalWarning, stacklevel=2) + warn("GUI is experimental/alpha", TqdmExperimentalWarning, stacklevel=2) self._tk_dispatching = self._tk_dispatching_helper() self._tk_window.protocol("WM_DELETE_WINDOW", self.cancel) @@ -130,21 +130,18 @@ class tqdm_tk(std_tqdm): # pragma: no cover _close() elif not self._tk_dispatching: if self._warn_leave: - warn('leave flag ignored if not in tkinter mainloop', + warn("leave flag ignored if not in tkinter mainloop", TqdmWarning, stacklevel=2) _close() def clear(self, *_, **__): pass - def display(self): + def display(self, *_, **__): self._tk_n_var.set(self.n) d = self.format_dict - d['ncols'] = None - text = self.format_meter(**d) - # fixup only default bar format - self._tk_text_var.set( - text.replace("||", "", 1) if "{l_bar}{r_bar}" in self.bar_format else text) + d['ncols'] = 0 # remove bar + self._tk_text_var.set(self.format_meter(**d)) if not self._tk_dispatching: self._tk_window.update()