From 9882f7fa3b36ae5c17cd2fddccb3cc561c108f97 Mon Sep 17 00:00:00 2001 From: Casper da Costa-Luis Date: Sun, 20 Dec 2020 18:59:46 +0000 Subject: [PATCH] move gui deprecation warning to display() --- setup.cfg | 1 - tqdm/std.py | 18 ++++++------------ 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/setup.cfg b/setup.cfg index bfa33a931..ca9a73e74 100644 --- a/setup.cfg +++ b/setup.cfg @@ -96,7 +96,6 @@ classifiers = Topic :: System :: Shells Topic :: Terminals Topic :: Utilities - [options] setup_requires = setuptools>=42; setuptools_scm[toml]>=3.4 python_requires = >=2.7, !=3.0.*, !=3.1.*, !=3.2.*, !=3.3.* diff --git a/tqdm/std.py b/tqdm/std.py index 9868af30e..d625e3962 100644 --- a/tqdm/std.py +++ b/tqdm/std.py @@ -1145,12 +1145,6 @@ def __iter__(self): avg_time = self.avg_time time = self._time - if getattr(self, 'sp', None) is None: - raise TqdmDeprecationWarning( - "Please use `tqdm.gui.tqdm(...)` instead of" - " `tqdm(..., gui=True)`\n", - fp_write=getattr(self.fp, 'write', sys.stderr.write)) - try: for obj in iterable: yield obj @@ -1253,12 +1247,6 @@ def update(self, n=1): rate = delta_t / delta_it self.avg_time = self.ema(rate, self.avg_time, self.smoothing) - if not hasattr(self, "sp"): - raise TqdmDeprecationWarning( - "Please use `tqdm.gui.tqdm(...)`" - " instead of `tqdm(..., gui=True)`\n", - fp_write=getattr(self.fp, 'write', sys.stderr.write)) - self.refresh(lock_args=self.lock_args) # If no `miniters` was specified, adjust automatically to the @@ -1495,6 +1483,12 @@ def display(self, msg=None, pos=None): if msg or msg is None: # override at `nrows - 1` msg = " ... (more hidden) ..." + if not hasattr(self, "sp"): + raise TqdmDeprecationWarning( + "Please use `tqdm.gui.tqdm(...)`" + " instead of `tqdm(..., gui=True)`\n", + fp_write=getattr(self.fp, 'write', sys.stderr.write)) + if pos: self.moveto(pos) self.sp(self.__repr__() if msg is None else msg)