Merge branch 'release/v3.46.1'

Author: wolph

progressbar/__about__.py

@@ -19,7 +19,7 @@
 long running operations.
 '''.strip().split())
 __email__ = 'wolph@wol.ph'
-__version__ = '3.46.0'
+__version__ = '3.46.1'
 __license__ = 'BSD'
 __copyright__ = 'Copyright 2015 Rick van Hattem (Wolph)'
 __url__ = 'https://github.com/WoLpH/python-progressbar'

progressbar/bar.py

@@ -412,7 +412,7 @@ def percentage(self):
 
     def get_last_update_time(self):
         if self._last_update_time:
-            return datetime.utcfromtimestamp(self._last_update_time)
+            return datetime.fromtimestamp(self._last_update_time)
 
     def set_last_update_time(self, value):
         if value:

progressbar/widgets.py

@@ -769,8 +769,11 @@ def __call__(self, progress, data):
         context['precision'] = self.precision
 
         try:
-            context['formatted_value'] = '{value:{width}.{precision}}'.format(
-                **context)
+            # Make sure to try and cast the value first, otherwise the
+            # formatting will generate warnings/errors on newer Python releases
+            value = float(value)
+            fmt = '{value:{width}.{precision}}'
+            context['formatted_value'] = fmt.format(**context)
         except (TypeError, ValueError):
             if value:
                 context['formatted_value'] = '{value:{width}}'.format(

tests/conftest.py

@@ -4,6 +4,7 @@
 import logging
 import freezegun
 import progressbar
+from datetime import datetime
 
 
 LOG_LEVELS = {
@@ -29,7 +30,12 @@ def small_interval(monkeypatch):
 
 @pytest.fixture(autouse=True)
 def sleep_faster(monkeypatch):
-    freeze_time = freezegun.freeze_time()
+    # The timezone offset in seconds, add 10 seconds to make sure we don't
+    # accidently get the wrong hour
+    offset_seconds = (datetime.now() - datetime.utcnow()).seconds + 10
+    offset_hours = int(offset_seconds / 3600)
+
+    freeze_time = freezegun.freeze_time(tz_offset=offset_hours)
     with freeze_time as fake_time:
         monkeypatch.setattr('time.sleep', fake_time.tick)
         monkeypatch.setattr('timeit.default_timer', time.time)

tests/test_progressbar.py

@@ -14,7 +14,7 @@ def test_examples(monkeypatch):
             pass
 
 
-@pytest.mark.no_freezegun
+@pytest.mark.filterwarnings('ignore:.*maxval.*:DeprecationWarning')
 @pytest.mark.parametrize('example', original_examples.examples)
 def test_original_examples(example, monkeypatch):
     monkeypatch.setattr(progressbar.ProgressBar,
@@ -23,13 +23,12 @@ def test_original_examples(example, monkeypatch):
     example()
 
 
-def test_examples_nullbar(monkeypatch):
+@pytest.mark.parametrize('example', examples.examples)
+def test_examples_nullbar(monkeypatch, example):
     # Patch progressbar to use null bar instead of regular progress bar
     monkeypatch.setattr(progressbar, 'ProgressBar', progressbar.NullBar)
-
     assert progressbar.ProgressBar._MINIMUM_UPDATE_INTERVAL < 0.0001
-    for example in examples.examples:
-        example()
+    example()
 
 
 def test_reuse():