Merge pull request #76 from bbolli/filesize-simplification

Author: hugovk

src/humanize/filesize.py

@@ -4,8 +4,8 @@
 from __future__ import annotations
 
 suffixes = {
-    "decimal": ("kB", "MB", "GB", "TB", "PB", "EB", "ZB", "YB"),
-    "binary": ("KiB", "MiB", "GiB", "TiB", "PiB", "EiB", "ZiB", "YiB"),
+    "decimal": (" kB", " MB", " GB", " TB", " PB", " EB", " ZB", " YB"),
+    "binary": (" KiB", " MiB", " GiB", " TiB", " PiB", " EiB", " ZiB", " YiB"),
     "gnu": "KMGTPEZY",
 }
 
@@ -34,6 +34,10 @@ def naturalsize(
         '2.930K'
         >>> naturalsize(3000, True)
         '2.9 KiB'
+        >>> naturalsize(10**28)
+        '10000.0 YB'
+        >>> naturalsize(-4096, True)
+        '-4.0 KiB'
 
         ```
     Args:
@@ -70,12 +74,8 @@ def naturalsize(
     for i, s in enumerate(suffix):
         unit = base ** (i + 2)
 
-        if abs_bytes < unit and not gnu:
-            return (format + " %s") % ((base * bytes_ / unit), s)
+        if abs_bytes < unit:
+            break
 
-        if abs_bytes < unit and gnu:
-            return (format + "%s") % ((base * bytes_ / unit), s)
-
-    if gnu:
-        return (format + "%s") % ((base * bytes_ / unit), s)
-    return (format + " %s") % ((base * bytes_ / unit), s)
+    ret: str = format % (base * bytes_ / unit) + s
+    return ret