v440 2.0.0.dev11__tar.gz → 2.0.0.dev13__tar.gz

{v440-2.0.0.dev11/src/v440.egg-info → v440-2.0.0.dev13}/PKG-INFO

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

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

{v440-2.0.0.dev11 → v440-2.0.0.dev13}/src/v440/_utils/SimpleQualifierParser.py

@@ -1,6 +1,5 @@
 from __future__ import annotations
 
-import dataclasses
 from typing import *
 
 from v440._utils import utils
@@ -10,11 +9,8 @@ from v440._utils.Pattern import Pattern
 __all__ = ["SimpleQualifierParser"]
 
 
-@dataclasses.dataclass(frozen=True)
 class SimpleQualifierParser:
-    keysforlist: tuple = ()
-    keysforstr: tuple = ()
-    allow_len_1: bool = False
+    __slots__ = ("_keysforlist", "_keysforstr", "_allow_len_1")
 
     __call__ = Digest("__call__")
 
@@ -31,7 +27,7 @@ class SimpleQualifierParser:
     @__call__.overload(list)
     def __call__(self: Self, value: list) -> Any:
         v: list = list(map(utils.segment, value))
-        n = self.nbylist(v)
+        n: Any = self.nbylist(v)
         if isinstance(n, str):
             raise TypeError
         return n
@@ -50,41 +46,51 @@ class SimpleQualifierParser:
         else:
             return int(n)
 
-    def __post_init__(self: Self) -> None:
-        if type(self.allow_len_1) is not bool:
-            raise TypeError
-        if type(self.keysforlist) is not tuple:
-            raise TypeError
-        if type(self.keysforstr) is not tuple:
-            raise TypeError
-        keys = self.keysforlist + self.keysforstr
-        for k in keys:
-            if k is None:
-                continue
-            if type(k) is str:
-                continue
-            raise TypeError
+    def __init__(
+        self: Self,
+        keysforlist: Iterable = (),
+        keysforstr: Iterable = (),
+        allow_len_1: Any = False,
+    ) -> None:
+        self._keysforlist = tuple(map(str, keysforlist))
+        self._keysforstr = tuple(map(self.optstr, keysforstr))
+        self._allow_len_1 = bool(allow_len_1)
+
+    @property
+    def allow_len_1(self: Self) -> tuple:
+        return self._allow_len_1
+
+    @property
+    def keysforlist(self: Self) -> tuple:
+        return self._keysforlist
+
+    @property
+    def keysforstr(self: Self) -> tuple:
+        return self._keysforstr
 
     def nbylist(self: Self, value: Any, /) -> Any:
         if len(value) == 2:
-            l, n = value
-            if l not in self.keysforlist:
-                raise ValueError
-            return n
+            if value[0] in self.keysforlist:
+                return value[1]
         if len(value) == 1:
-            n = value[0]
-            if not self.allow_len_1:
-                raise ValueError
-            return n
+            if self.allow_len_1:
+                return value[0]
         raise ValueError
 
+    @classmethod
+    def optstr(cls: type, value: Any) -> Optional[str]:
+        if value is None:
+            return
+        else:
+            return str(value)
+
 
-POST = SimpleQualifierParser(
+POST: SimpleQualifierParser = SimpleQualifierParser(
     keysforlist=("post", "rev", "r", ""),
     keysforstr=(None, "post", "rev", "r"),
     allow_len_1=True,
 )
-DEV = SimpleQualifierParser(
+DEV: SimpleQualifierParser = SimpleQualifierParser(
     keysforlist=("dev",),
     keysforstr=(None, "dev"),
 )

{v440-2.0.0.dev11 → v440-2.0.0.dev13}/src/v440/_utils/VList.py

@@ -2,10 +2,16 @@ from typing import *
 
 from datahold import OkayList
 
-from v440._utils import utils
 from v440.core.VersionError import VersionError
 
 
+def clone(value: Any) -> Any:
+    if isinstance(value, VList):
+        return list(map(clone, value))
+    else:
+        return value
+
+
 class VList(OkayList):
     def __eq__(self: Self, other: Any) -> bool:
         "This magic method implements self==other."
@@ -53,7 +59,7 @@ class VList(OkayList):
     def __setattr__(self: Self, name: str, value: Any) -> Any:
         if name not in type(self).__annotations__.keys():
             return object.__setattr__(self, name, value)
-        backup: list = utils.clone(self)
+        backup: list = clone(self)
         exc: BaseException
         try:
             object.__setattr__(self, name, value)

v440-2.0.0.dev13/src/v440/_utils/WList.py

@@ -0,0 +1,15 @@
+from typing import *
+
+from v440._utils.VList import VList
+
+__all__ = ["WList"]
+
+
+class WList(VList):
+    @property
+    def data(self: Self) -> list:
+        return list(self._data)
+
+    @data.setter
+    def data(self: Self, value: Any) -> None:
+        self._data = value

{v440-2.0.0.dev11 → v440-2.0.0.dev13}/src/v440/_utils/utils.py

@@ -5,17 +5,9 @@ import string
 from typing import *
 
 from v440._utils.Digest import Digest
-from v440._utils.VList import VList
 from v440.core.VersionError import VersionError
 
 
-def clone(value: Any) -> Any:
-    if isinstance(value, VList):
-        return list(map(clone, value))
-    else:
-        return value
-
-
 def literal(value: Any, /) -> str:
     v: Any = segment(value)
     if type(v) is str:

{v440-2.0.0.dev11 → v440-2.0.0.dev13}/src/v440/core/Base.py

@@ -80,11 +80,11 @@ class Base(WList):
         return self.format()
 
     @property
-    def data(self: Self) -> list:
-        return [self.epoch, self.release]
+    def _data(self: Self) -> tuple:
+        return self.epoch, self.release
 
-    @data.setter
-    def data(self: Self, value: Any) -> None:
+    @_data.setter
+    def _data(self: Self, value: Any) -> None:
         self.epoch, self.release = parse_data(value)
 
     @property
@@ -109,5 +109,3 @@ class Base(WList):
     @release.setter
     def release(self: Self, value: Any) -> None:
         self._release.data = value
-
-    _data = data  # why is this necessary?

{v440-2.0.0.dev11 → v440-2.0.0.dev13}/src/v440/core/Pre.py

@@ -83,14 +83,12 @@ class Pre(WList):
         return ans
 
     @property
-    def data(self: Self) -> list:
-        return [self._phase, self._subphase]
+    def _data(self: Self) -> tuple:
+        return self._phase, self._subphase
 
-    @data.setter
-    def data(self: Self, value: Any) -> None:
+    @_data.setter
+    def _data(self: Self, value: Any) -> None:
         self._phase, self._subphase = parse_data(value)
 
     def isempty(self: Self) -> bool:
-        return self._data == [None, None]
-
-    _data = data
+        return set(self._data) == {None}

{v440-2.0.0.dev11 → v440-2.0.0.dev13}/src/v440/core/Qualification.py

@@ -99,11 +99,11 @@ class Qualification(WList):
         return ans
 
     @property
-    def data(self: Self) -> list:
-        return [self.pre, self.post, self.dev]
+    def _data(self: Self) -> tuple:
+        return self.pre, self.post, self.dev
 
-    @data.setter
-    def data(self: Self, value: Any) -> None:
+    @_data.setter
+    def _data(self: Self, value: Any) -> None:
         self.pre, self.post, self.dev = parse_data(value)
 
     @property
@@ -141,5 +141,3 @@ class Qualification(WList):
     @pre.setter
     def pre(self: Self, value: Any) -> None:
         self._pre.data = value
-
-    _data = data

{v440-2.0.0.dev11 → v440-2.0.0.dev13}/src/v440/core/Version.py

@@ -61,6 +61,14 @@ class Version(WList):
     def __str__(self: Self) -> str:
         return self.format()
 
+    @property
+    def _data(self: Self) -> tuple:
+        return (self.public, self.local)
+
+    @_data.setter
+    def _data(self: Self, value: Any) -> None:
+        self.public, self.local = parse_data(value)
+
     @property
     def base(self: Self) -> Base:
         return self.public.base
@@ -69,14 +77,6 @@ class Version(WList):
     def base(self: Self, value: Any) -> None:
         self.base.data = value
 
-    @property
-    def data(self: Self) -> str:
-        return [self.public, self.local]
-
-    @data.setter
-    def data(self: Self, value: Any) -> None:
-        self.public, self.local = parse_data(value)
-
     @property
     def dev(self: Self) -> Optional[int]:
         return self.qualification.dev
@@ -172,5 +172,3 @@ class Version(WList):
             m: str = "%r is not a property"
             m %= x
             raise AttributeError(m)
-
-    _data = data

{v440-2.0.0.dev11 → v440-2.0.0.dev13/src/v440.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: v440
-Version: 2.0.0.dev11
+Version: 2.0.0.dev13
 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.dev11/src/v440/_utils/WList.py

@@ -1,11 +0,0 @@
-from typing import *
-
-from v440._utils import utils
-from v440._utils.VList import VList
-from v440.core.VersionError import VersionError
-
-__all__ = ["WList"]
-
-
-class WList(VList):
-    pass