v440 2.0.0.dev181__tar.gz → 2.0.0.dev182__tar.gz

{v440-2.0.0.dev181/src/v440.egg-info → v440-2.0.0.dev182}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: v440
-Version: 2.0.0.dev181
+Version: 2.0.0.dev182
 Summary: This project provides mutable version objects in accordance with PEP440.
 Author-email: Johannes <johannes.programming@gmail.com>
 License: The MIT License (MIT)

{v440-2.0.0.dev181 → v440-2.0.0.dev182}/pyproject.toml

@@ -37,7 +37,7 @@ keywords = []
 name = "v440"
 readme = "README.rst"
 requires-python = ">=3.11"
-version = "2.0.0.dev181"
+version = "2.0.0.dev182"
 
 [project.license]
 file = "LICENSE.txt"

{v440-2.0.0.dev181 → v440-2.0.0.dev182}/src/v440/_utils/BaseStringer.py

@@ -29,9 +29,9 @@ class BaseStringer(metaclass=ABCMeta):
         try:
             return self._format(str(format_spec))
         except Exception:
-            msg: str = "unsupported format string passed to %s.__format__"
-            msg %= type(self).__name__
-            raise TypeError(msg)  # from None
+            msg: str = "Invalid format specifier %r for object of type %r"
+            msg %= (format_spec, type(self).__name__)
+            raise TypeError(msg) from None
 
     @setdoc.basic
     def __ge__(self: Self, other: Any) -> bool:

{v440-2.0.0.dev181 → v440-2.0.0.dev182}/src/v440/core/Release.py

@@ -89,18 +89,23 @@ class Release(ListStringer):
         return v
 
     def _format(self: Self, format_spec: str) -> str:
-        i: Optional[int]
-        if format_spec:
-            i = int(format_spec)
-        else:
-            i = None
-        l: list = self[:i]
-        if len(l) == 0:
-            l += [0]
-        l = list(map(str, l))
-        ans: str = ".".join(l)
+        i: int = self._format_r(format_spec)
+        i = max(i, 1, len(self))
+        ans: str = ".".join(map(str, self[:i]))
         return ans
 
+    @classmethod
+    def _format_r(cls: type, format_spec: str) -> Optional[int]:
+        if format_spec == "":
+            return 0
+        if not format_spec.startswith("0"):
+            raise ValueError
+        if not format_spec.endswith("r"):
+            raise ValueError
+        if set(format_spec[:-1]) <= set("0123456789"):
+            return int(format_spec[:-1])
+        raise ValueError
+
     def _init_setup(self: Self) -> None:
         self._data = ()
 

{v440-2.0.0.dev181 → v440-2.0.0.dev182}/src/v440/tests/test_testdata.py

@@ -264,8 +264,8 @@ class TestPackagingA(unittest.TestCase):
     def go(self: Self, text: str) -> None:
         a: packaging.version.Version = packaging.version.Version(text)
         b: str = str(a)
-        f: int = len(a.release)
-        g: str = format(Version(text), str(f))
+        f: str = "0%sr" % len(a.release)
+        g: str = format(Version(text), f)
         self.assertEqual(b, g)
 
 

{v440-2.0.0.dev181 → v440-2.0.0.dev182}/src/v440/tests/test_version.py

@@ -93,7 +93,7 @@ class TestExample(unittest.TestCase):
     def test_example_1(self: Self) -> None:
         v: Version = Version("v1.0.0")
         self.assertEqual(str(v), "1")  # Initial version
-        self.assertEqual(format(v, "3"), "1.0.0")  # Initial version formatted
+        self.assertEqual(format(v, "03r"), "1.0.0")  # Initial version formatted
 
     def test_example_2(self: Self) -> None:
         v: Version = Version("2.5.3")
@@ -192,7 +192,9 @@ class TestExample(unittest.TestCase):
         v.public.qual.post = 1
         v.local.string = "local.7.dev"
         self.assertEqual(str(v), "1.2.3.post1+local.7.dev")  # Post-release version
-        self.assertEqual(format(v, "-1"), "1.2.post1+local.7.dev")  # Formatted version
+        self.assertEqual(
+            format(v, "02r"), "1.2.3.post1+local.7.dev"
+        )  # Formatted version
         v.public.qual.post = 2
         self.assertEqual(str(v), "1.2.3.post2+local.7.dev")  # Modified version
         v.public.qual.post = None

{v440-2.0.0.dev181 → v440-2.0.0.dev182/src/v440.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: v440
-Version: 2.0.0.dev181
+Version: 2.0.0.dev182
 Summary: This project provides mutable version objects in accordance with PEP440.
 Author-email: Johannes <johannes.programming@gmail.com>
 License: The MIT License (MIT)