Add compatibility with older humanize versions (#1196)

pabs3 · web-flow · commit d78e53c018c1 · 2022-05-21T10:53:59.000-04:00
Also drop the humanize pinning since newer versions work too. Fixes: commit 70b1ae4 See-also: #1156
diff --git a/flower/utils/__init__.py b/flower/utils/__init__.py
@@ -20,7 +20,7 @@ def bugreport(app=None):
         return 'flower   -> flower:%s tornado:%s humanize:%s%s' % (
             __version__,
             tornado.version,
-            humanize.__version__,
+            getattr(humanize, '__version__', None) or getattr(humanize, 'VERSION'),
             app.bugreport()
         )
     except (ImportError, AttributeError) as e:
diff --git a/requirements/default.txt b/requirements/default.txt
@@ -1,5 +1,5 @@
 celery>=5.0.5
 tornado>=5.0.0,<7.0.0
 prometheus_client>=0.8.0
-humanize==3.12.0
+humanize
 pytz

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,7 @@ def bugreport(app=None):`
`20`	`20`	`return 'flower -> flower:%s tornado:%s humanize:%s%s' % (`
`21`	`21`	`__version__,`
`22`	`22`	`tornado.version,`
`23`		`- humanize.__version__,`
	`23`	`+ getattr(humanize, '__version__', None) or getattr(humanize, 'VERSION'),`
`24`	`24`	`app.bugreport()`
`25`	`25`	`)`
`26`	`26`	`except (ImportError, AttributeError) as e:`