python-fontbro 0.32.1__tar.gz → 0.33.0__tar.gz

{python_fontbro-0.32.1/python_fontbro.egg-info → python_fontbro-0.33.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fontbro
-Version: 0.32.1
+Version: 0.33.0
 Summary: friendly font operations on top of fontTools.
 Author-email: Fabio Caccamo <fabio.caccamo@gmail.com>
 Maintainer-email: Fabio Caccamo <fabio.caccamo@gmail.com>

{python_fontbro-0.32.1 → python_fontbro-0.33.0}/fontbro/metadata.py

@@ -4,4 +4,4 @@ __description__ = "friendly font operations on top of fontTools."
 __email__ = "fabio.caccamo@gmail.com"
 __license__ = "MIT"
 __title__ = "python-fontbro"
-__version__ = "0.32.1"
+__version__ = "0.33.0"

{python_fontbro-0.32.1 → python_fontbro-0.33.0}/fontbro/version.py

@@ -1,7 +1,7 @@
 from __future__ import annotations
 
 import re
-from typing import Any
+from typing import Any, overload
 
 from fontTools.misc.fixedTools import fixedToStr, floatToFixed
 from fontTools.ttLib import TTFont
@@ -74,23 +74,43 @@ def format_version(
     return f"{prefix}{major}.{minor}"
 
 
+@overload
 def parse_version(
     value: str | None,
-) -> float:
+    *,
+    default: float = ...,
+) -> float: ...
+
+
+@overload
+def parse_version(
+    value: str | None,
+    *,
+    default: None,
+) -> float | None: ...
+
+
+def parse_version(
+    value: str | None,
+    *,
+    default: float | None = 0.0,
+) -> float | None:
     """
     Parses the version value from the given version name record value,
     eg. "Version 1.015;git-0a5106e0b" -> 1.015.
     The value is matched from the beginning of the string to avoid reading
     unrelated numbers (eg. a date or a tool version).
-    Returns 0.0 if the value cannot be parsed, or if it holds a value that
-    cannot be stored as a font version.
+    Returns the default (0.0) if the value cannot be parsed, or if it holds
+    a value that cannot be stored as a font version. A zero version
+    (eg. "Version 0.000") is parsed as 0.0: with default=None it can be told
+    apart from a value that cannot be parsed.
     """
     match = _VERSION_PATTERN.match((value or "").strip())
     if not match:
-        return 0.0
+        return default
     version = float(f"{match[1]}.{match[2]}")
-    if not 0 < version <= _VERSION_MAX_VALUE:
-        return 0.0
+    if not 0 <= version <= _VERSION_MAX_VALUE:
+        return default
     return normalize_version(version)
 
 

{python_fontbro-0.32.1 → python_fontbro-0.33.0/python_fontbro.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-fontbro
-Version: 0.32.1
+Version: 0.33.0
 Summary: friendly font operations on top of fontTools.
 Author-email: Fabio Caccamo <fabio.caccamo@gmail.com>
 Maintainer-email: Fabio Caccamo <fabio.caccamo@gmail.com>

{python_fontbro-0.32.1 → python_fontbro-0.33.0}/tests/test_version.py

@@ -76,6 +76,24 @@ class VersionTestCase(AbstractTestCase):
             with self.subTest(f"Test with value: {value!r}", value=value):
                 self.assertEqual(parse_version(value), expected_value)
 
+    def test_parse_version_with_default(self):
+        values = [
+            ("Version 1.015", 1.015),
+            # a zero version is a version (eg. a font in development)
+            ("Version 0.000", 0.0),
+            ("0.000", 0.0),
+            # invalid values
+            (None, None),
+            ("", None),
+            ("Regular", None),
+            ("1", None),
+            ("Version 32768.0", None),
+        ]
+        for value, expected_value in values:
+            with self.subTest(f"Test with value: {value!r}", value=value):
+                self.assertEqual(parse_version(value, default=None), expected_value)
+        self.assertEqual(parse_version("Regular", default=1.0), 1.0)
+
     def test_normalize_version(self):
         values = [
             (1.0149993896484375, 1.015),