update timedelta to better handle days and the "x and" type strings

binarycpython/utils/functions.py

@@ -77,7 +77,13 @@ def timedelta(delta):
     # currently use the humanize module to do this
     t = humanize.time.precisedelta(dt.timedelta(seconds=delta),format='%0.2f',minimum_unit='milliseconds',suppress=['milliseconds'])
     # and use more compact units
+    t = t.replace(" days and","d")
+    t = t.replace(" hours and","h")
+    t = t.replace(" minutes and","m")
+    t = t.replace(" seconds and","s")
+    t = t.replace(" days","d")
     t = t.replace(" hours","h")
+    t = t.replace(" minutes","m")
     t = t.replace(" seconds","s")
     return t