v440 2.0.0.dev50__tar.gz → 2.0.0.dev52__tar.gz

{v440-2.0.0.dev50/src/v440.egg-info → v440-2.0.0.dev52}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: v440
-Version: 2.0.0.dev50
+Version: 2.0.0.dev52
 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.dev50 → v440-2.0.0.dev52}/pyproject.toml

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

{v440-2.0.0.dev50 → v440-2.0.0.dev52}/src/v440/_utils/BaseList.py

@@ -1,9 +1,15 @@
 from abc import ABCMeta, abstractmethod
 from typing import *
 
+import setdoc
+
 
 class BaseList(metaclass=ABCMeta):
     __slots__ = ()
 
     @abstractmethod
+    @setdoc.basic
     def __bool__(self: Self) -> bool: ...
+
+    @abstractmethod
+    def _format(self: Self, format_spec: str) -> str: ...

{v440-2.0.0.dev50 → v440-2.0.0.dev52}/src/v440/_utils/Digest.py

@@ -4,6 +4,8 @@ import functools
 import types
 from typing import *
 
+import setdoc
+
 
 class Digest:
     __slots__ = ("__dict__", "lookup", "name", "kind")
@@ -23,12 +25,12 @@ class Digest:
         "This magic method implements getting as an attribute from a class or an object."
         return self.wrapped.__get__(*args, **kwargs)
 
+    @setdoc.basic
     def __init__(
         self: Self,
         name: str = "",
         kind: Any = None,
     ) -> None:
-        "This magic method sets up self."
         self.lookup = dict()
         self.name = name
         self.kind = kind

{v440-2.0.0.dev50 → v440-2.0.0.dev52}/src/v440/_utils/SlotList.py

@@ -1,4 +1,5 @@
 import collections
+import sys
 from abc import abstractmethod
 from typing import *
 
@@ -37,8 +38,13 @@ class SlotList(collections.abc.Collection, BaseList):
             return self.data == alt.data
 
     @setdoc.basic
-    def __format__(self: Self, format_spec: Any = "", /) -> str:
-        return format(str(self), str(format_spec))
+    def __format__(self: Self, format_spec: Any) -> str:
+        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
 
     @setdoc.basic
     def __getitem__(self: Self, key: Any) -> Any:
@@ -118,7 +124,7 @@ class SlotList(collections.abc.Collection, BaseList):
 
     @setdoc.basic
     def __str__(self: Self) -> str:
-        return NotImplemented
+        return format(self)
 
     @classmethod
     def __subclasshook__(cls: type, other: type, /) -> bool:
@@ -128,6 +134,7 @@ class SlotList(collections.abc.Collection, BaseList):
     def _cmp(self: Self) -> Any:
         return self.data
 
+    @setdoc.basic
     def copy(self: Self) -> Self:
         return type(self)(self)
 
@@ -136,6 +143,7 @@ class SlotList(collections.abc.Collection, BaseList):
 
     @property
     @abstractmethod
+    @setdoc.basic
     def data(self: Self) -> list: ...
 
     def index(self: Self, value: Any) -> Any:

{v440-2.0.0.dev50 → v440-2.0.0.dev52}/src/v440/_utils/VList.py

@@ -1,3 +1,4 @@
+import builtins
 from typing import *
 
 import setdoc
@@ -11,6 +12,19 @@ class VList(OkayList, BaseList):
 
     __slots__ = ()
 
+    @setdoc.basic
+    def __format__(self: Self, format_spec: Any) -> str:
+        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
+
+    @setdoc.basic
+    def __str__(self: Self) -> str:
+        return builtins.format(self)
+
     @setdoc.basic
     def __eq__(self: Self, other: Any) -> bool:
         ans: bool

{v440-2.0.0.dev50 → v440-2.0.0.dev52}/src/v440/core/Base.py

@@ -80,9 +80,12 @@ class Base(SlotList):
         self._release = Release()
         self.data = data
 
-    @setdoc.basic
-    def __str__(self: Self) -> str:
-        return self.format()
+    def _format(self: Self, format_spec: str) -> str:
+        ans: str = ""
+        if self.epoch:
+            ans += "%s!" % self.epoch
+        ans += format(self.release, format_spec)
+        return ans
 
     @property
     @setdoc.basic
@@ -95,7 +98,8 @@ class Base(SlotList):
         self.epoch, self.release = parse_data(value)
 
     @property
-    def epoch(self: Self) -> Optional[int]:
+    def epoch(self: Self) -> int:
+        "This property represents the epoch."
         return self._epoch
 
     @epoch.setter
@@ -103,15 +107,9 @@ class Base(SlotList):
     def epoch(self: Self, value: Any) -> None:
         self._epoch = parse_epoch(value)
 
-    def format(self: Self, cutoff: Any = None) -> str:
-        ans: str = ""
-        if self.epoch:
-            ans += "%s!" % self.epoch
-        ans += self.release.format(cutoff)
-        return ans
-
     @property
     def release(self: Self) -> Release:
+        "This property represents the release."
         return self._release
 
     @release.setter

{v440-2.0.0.dev50 → v440-2.0.0.dev52}/src/v440/core/Local.py

@@ -12,8 +12,43 @@ from v440._utils.VList import VList
 
 __all__ = ["Local"]
 
+parse_data: Digest = Digest("parse_data")
+
+
+@parse_data.overload()
+def parse_data() -> list:
+    return list()
+
+
+@parse_data.overload(int)
+def parse_data(value: int) -> list:
+    return [value]
+
+
+@parse_data.overload(list)
+def parse_data(value: list) -> list:
+    ans: list = list(map(utils.segment, value))
+    if None in ans:
+        raise ValueError
+    return ans
+
+
+@parse_data.overload(str)
+def parse_data(value: str) -> list:
+    v: str = value
+    if v.startswith("+"):
+        v = v[1:]
+    v = v.replace("_", ".")
+    v = v.replace("-", ".")
+    ans: list = v.split(".")
+    ans = list(map(utils.segment, ans))
+    if None in ans:
+        raise ValueError
+    return ans
+
 
 class Local(VList):
+    __slots__ = ()
 
     data: list[int | str]
 
@@ -33,42 +68,13 @@ class Local(VList):
             ans = self._cmp() <= alt._cmp()
         return ans
 
-    @setdoc.basic
-    def __str__(self: Self) -> str:
-        return ".".join(map(str, self))
-
     def _cmp(self: Self) -> list:
         return list(map(self._sortkey, self))
 
-    _data_calc: Digest = Digest("_data_calc")
-
-    @_data_calc.overload()
-    def _data_calc(self: Self) -> list:
-        return list()
-
-    @_data_calc.overload(int)
-    def _data_calc(self: Self, value: int) -> list:
-        return [value]
-
-    @_data_calc.overload(list)
-    def _data_calc(self: Self, value: list) -> list:
-        ans: list = list(map(utils.segment, value))
-        if None in ans:
+    def _format(self: Self, format_spec: str) -> str:
+        if format_spec:
             raise ValueError
-        return ans
-
-    @_data_calc.overload(str)
-    def _data_calc(self: Self, value: str) -> list:
-        v: str = value
-        if v.startswith("+"):
-            v = v[1:]
-        v = v.replace("_", ".")
-        v = v.replace("-", ".")
-        ans: list = v.split(".")
-        ans = list(map(utils.segment, ans))
-        if None in ans:
-            raise ValueError
-        return ans
+        return ".".join(map(str, self))
 
     @staticmethod
     def _sortkey(value: Any) -> tuple[bool, Any]:
@@ -82,7 +88,7 @@ class Local(VList):
     @data.setter
     @guard
     def data(self: Self, value: Any) -> None:
-        self._data = self._data_calc(value)
+        self._data = parse_data(value)
 
     @functools.wraps(VList.sort)
     def sort(self: Self, /, *, key: Any = None, **kwargs: Any) -> None:

{v440-2.0.0.dev50 → v440-2.0.0.dev52}/src/v440/core/Public.py

@@ -52,11 +52,12 @@ class Public(SlotList):
         self._qual = Qual()
         self.data = data
 
-    def __str__(self: Self) -> str:
-        return self.format()
+    def _format(self: Self, format_spec: str) -> str:
+        return format(self.base, format_spec) + format(self.qual)
 
     @property
     def base(self: Self) -> Base:
+        "This property represents the version base."
         return self._base
 
     @base.setter
@@ -74,11 +75,9 @@ class Public(SlotList):
     def data(self: Self, value: Any) -> None:
         self.base, self.qual = parse_data(value)
 
-    def format(self: Self, cutoff: Any = None) -> str:
-        return self.base.format(cutoff) + str(self.qual)
-
     @property
     def qual(self: Self) -> Qual:
+        "This property represents the qualification."
         return self._qual
 
     @qual.setter

{v440-2.0.0.dev50 → v440-2.0.0.dev52}/src/v440/core/Qual.py

@@ -16,6 +16,7 @@ class Qual(SlotList):
     __slots__ = ("_prephase", "_presubphase", "_post", "_dev")
 
     data: list
+    pre: tuple
     prephase: Optional[str]
     presubphase: Optional[int]
     post: Optional[int]
@@ -33,19 +34,6 @@ class Qual(SlotList):
         self._dev = None
         self.data = data
 
-    @setdoc.basic
-    def __str__(self: Self) -> str:
-        ans: str = ""
-        if self.prephase is not None:
-            ans += self.prephase
-        if self.presubphase is not None:
-            ans += str(self.presubphase)
-        if self.post is not None:
-            ans += ".post%s" % self.post
-        if self.dev is not None:
-            ans += ".dev%s" % self.dev
-        return ans
-
     def _cmp(self: Self) -> list:
         ans: list = list()
         if not self.pre.isempty():
@@ -60,6 +48,20 @@ class Qual(SlotList):
         ans.append(float("inf") if self.dev is None else self.dev)
         return ans
 
+    def _format(self: Self, format_spec: str) -> str:
+        if format_spec:
+            raise ValueError
+        ans: str = ""
+        if self.prephase is not None:
+            ans += self.prephase
+        if self.presubphase is not None:
+            ans += str(self.presubphase)
+        if self.post is not None:
+            ans += ".post%s" % self.post
+        if self.dev is not None:
+            ans += ".dev%s" % self.dev
+        return ans
+
     @property
     @setdoc.basic
     def data(self: Self) -> list:
@@ -102,7 +104,7 @@ class Qual(SlotList):
 
     @property
     def pre(self: Self) -> tuple:
-        return (self._prephase, self._presubphase)
+        return self._prephase, self._presubphase
 
     @pre.setter
     @guard

{v440-2.0.0.dev50 → v440-2.0.0.dev52}/src/v440/core/Release.py

@@ -70,6 +70,8 @@ def tolist(value: Any, *, slicing: Any) -> list:
 
 @keyalias(major=0, minor=1, micro=2, patch=2)
 class Release(VList):
+    __slots__ = ()
+
     data: list[int]
     major: int
     minor: int
@@ -146,9 +148,18 @@ class Release(VList):
         k: range = utils.torange(key, len(self))
         self._setitem_range(k, value)
 
-    @setdoc.basic
-    def __str__(self: Self) -> str:
-        return self.format()
+    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)
+        return ans
 
     def _getitem_int(self: Self, key: int) -> int:
         if key < len(self):
@@ -220,13 +231,3 @@ class Release(VList):
         while v and v[-1] == 0:
             v.pop()
         self._data = v
-
-    def format(self: Self, cutoff: Any = None) -> str:
-        s: str = str(cutoff) if cutoff else ""
-        i: Optional[int] = int(s) if s else None
-        l: list = self[:i]
-        if len(l) == 0:
-            l += [0]
-        l = list(map(str, l))
-        ans: str = ".".join(l)
-        return ans

{v440-2.0.0.dev50 → v440-2.0.0.dev52}/src/v440/core/Version.py

@@ -52,9 +52,14 @@ class Version(SlotList):
         self._local = Local()
         self.data = data
 
-    @setdoc.basic
     def __str__(self: Self) -> str:
-        return self.format()
+        return format(self)
+
+    def _format(self: Self, format_spec: str) -> str:
+        ans: str = format(self.public, format_spec)
+        if self.local:
+            ans += "+" + format(self.local)
+        return ans
 
     @property
     @setdoc.basic
@@ -66,12 +71,6 @@ class Version(SlotList):
     def data(self: Self, value: Any) -> None:
         self.public, self.local = parse_data(value)
 
-    def format(self: Self, cutoff: Any = None) -> str:
-        ans: str = self.public.format(cutoff)
-        if self.local:
-            ans += "+%s" % self.local
-        return ans
-
     @property
     def local(self: Self) -> Local:
         return self._local

{v440-2.0.0.dev50 → v440-2.0.0.dev52}/src/v440/core/VersionError.py

@@ -1,8 +1,11 @@
 from typing import *
 
+import setdoc
+
 __all__ = ["VersionError"]
 
 
 class VersionError(ValueError):
+    @setdoc.basic
     def __init__(self: Self, *args: Any) -> None:
         super().__init__(*args)

{v440-2.0.0.dev50 → v440-2.0.0.dev52}/src/v440/tests/test_testdata.py

@@ -261,7 +261,7 @@ class TestPackagingA(unittest.TestCase):
         a = packaging.version.Version(text)
         b = str(a)
         f = len(a.release)
-        g = Version(text).format(f)
+        g = format(Version(text), str(f))
         self.assertEqual(b, g)
 
 

{v440-2.0.0.dev50 → v440-2.0.0.dev52}/src/v440/tests/test_version.py

@@ -96,7 +96,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(v.format("3"), "1.0.0")  # Initial version formatted
+        self.assertEqual(format(v, "3"), "1.0.0")  # Initial version formatted
 
     def test_example_2(self: Self) -> None:
         v: Version = Version("2.5.3")
@@ -163,7 +163,7 @@ class TestExample(unittest.TestCase):
         v.public.qual.post = "post1"
         v.local = "local.7.dev"
         self.assertEqual(str(v), "1.2.3.post1+local.7.dev")  # Post-release version
-        self.assertEqual(v.format("-1"), "1.2.post1+local.7.dev")  # Formatted version
+        self.assertEqual(format(v, "-1"), "1.2.post1+local.7.dev")  # Formatted version
         v.public.qual.post = "post.2"
         self.assertEqual(str(v), "1.2.3.post2+local.7.dev")  # Modified version
         v.public.qual.post = None

{v440-2.0.0.dev50 → v440-2.0.0.dev52}/src/v440/tests/testdata.toml

@@ -1030,10 +1030,10 @@ clsname = "Base"
 attrname = "fdsfvdsff"
 attrvalue = 42
 
-#[core-non-attributes.test-0100]
-#clsname = "Local"
-#attrname = "fdsfvdsff"
-#attrvalue = 42
+[core-non-attributes.test-0100]
+clsname = "Local"
+attrname = "fdsfvdsff"
+attrvalue = 42
 
 [core-non-attributes.test-0200]
 clsname = "Public"
@@ -1045,10 +1045,10 @@ clsname = "Qual"
 attrname = "fdsfvdsff"
 attrvalue = 42
 
-#[core-non-attributes.test-0400]
-#clsname = "Release"
-#attrname = "fdsfvdsff"
-#attrvalue = 42
+[core-non-attributes.test-0400]
+clsname = "Release"
+attrname = "fdsfvdsff"
+attrvalue = 42
 
 [core-non-attributes.test-0500]
 clsname = "Public"

{v440-2.0.0.dev50 → v440-2.0.0.dev52/src/v440.egg-info}/PKG-INFO

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