jetpytools 1.3.0__tar.gz → 1.4.0__tar.gz

{jetpytools-1.3.0 → jetpytools-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jetpytools
-Version: 1.3.0
+Version: 1.4.0
 Summary: Collection of stuff that's useful in general python programming
 Author: Jaded Encoding Thaumaturgy
 Author-email: jaded.encoding.thaumaturgy@gmail.com

{jetpytools-1.3.0 → jetpytools-1.4.0}/jetpytools/_metadata.py

@@ -1,6 +1,6 @@
 """Collection of stuff that's useful in general python programming"""
 
-__version__ = '1.3.0'
+__version__ = '1.4.0'
 
 __author_name__, __author_email__ = 'Jaded Encoding Thaumaturgy', 'jaded.encoding.thaumaturgy@gmail.com'
 __maintainer_name__, __maintainer_email__ = __author_name__, __author_email__

{jetpytools-1.3.0 → jetpytools-1.4.0}/jetpytools/exceptions/base.py

@@ -72,10 +72,6 @@ class CustomErrorMeta(type):
 
         return exception
 
-    if TYPE_CHECKING:
-        def __getitem__(self, exception: type[Exception]) -> CustomError:
-            ...
-
 
 SelfCErrorMeta = TypeVar('SelfCErrorMeta', bound=CustomErrorMeta)
 
@@ -102,17 +98,11 @@ class CustomError(ExceptionT, metaclass=CustomErrorMeta):
         super().__init__(message)
 
     def __class_getitem__(cls, exception: str | type[ExceptionT] | ExceptionT) -> CustomError:
-        if isinstance(exception, str):
-            class inner_exception(cls):  # type: ignore
-                ...
-        else:
-            if not issubclass(exception, type):  # type: ignore
-                exception = exception.__class__  # type: ignore
+        from warnings import warn
 
-            class inner_exception(cls, exception):  # type: ignore
-                ...
+        warn("Custom error is not subscriptable anymore. Don't use it", DeprecationWarning)
 
-        return CustomErrorMeta.setup_exception(inner_exception, exception)  # type: ignore
+        return cls()
 
     def __call__(
         self,

{jetpytools-1.3.0 → jetpytools-1.4.0}/jetpytools/types/utils.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 from functools import partial, wraps
 from inspect import Signature
 from inspect import _empty as empty_param
-from inspect import isclass
 from typing import (
     TYPE_CHECKING, Any, Callable, Concatenate, Generator, Generic, Iterable, Iterator, Mapping, NoReturn, Protocol,
     Sequence, TypeVar, cast, overload
@@ -411,89 +410,55 @@ def get_subclasses(family: type[T], exclude: Sequence[type[T]] = []) -> list[typ
     return list(set(_subclasses(family)))
 
 
-class classproperty(Generic[P, R, T, T0, P0]):
+class classproperty(Generic[T, R]):
     """
     Make a class property. A combination between classmethod and property.
     """
 
     __isabstractmethod__: bool = False
 
-    class metaclass(type):
-        """This must be set for the decorator to work."""
-
-        def __setattr__(self, key: str, value: Any) -> None:
-            if key in self.__dict__:
-                obj = self.__dict__.get(key)
-
-                if obj and isinstance(obj, classproperty):
-                    obj.__set__(self, value)
-                    return
-
-            super(classproperty.metaclass, self).__setattr__(key, value)
-
     def __init__(
         self,
-        fget: classmethod[T, P, R] | Callable[P, R],
-        fset: classmethod[T, P, None] | Callable[[T, T0], None] | None = None,
-        fdel: classmethod[T, P1, None] | Callable[P1, None] | None = None,
+        fget: Callable[[type[T]], R] | classmethod[T, ..., R],
+        fset: Callable[[type[T], R], None] | classmethod[T, Concatenate[R, ...], None] | None = None,
+        fdel: Callable[[type[T]], None] | classmethod[T, ..., None] | None = None,
         doc: str | None = None,
     ) -> None:
         self.fget = self._wrap(fget)
         self.fset = self._wrap(fset) if fset is not None else fset
         self.fdel = self._wrap(fdel) if fdel is not None else fdel
 
-        self.doc = doc
+        self.__doc__ = doc
 
-    def _wrap(self, func: classmethod[T1, P1, R1] | Callable[P1, R1] | Callable[..., R1]) -> classmethod[T1, P1, R1]:
-        if not isinstance(func, (classmethod, staticmethod)):
-            func = classmethod(func)  # type: ignore
+    def _wrap(self, func: Callable[..., R1] | classmethod[T, P1, R1]) -> classmethod[T, P1, R1]:
+        if not isinstance(func, classmethod):
+            func = classmethod(func)
 
-        return func  # type: ignore
+        return func
 
-    def getter(self, __fget: classmethod[T, P, R] | Callable[P1, R1]) -> classproperty[P1, R1, T, T0, P0]:
-        self.fget = self._wrap(__fget)  # type: ignore
-        return self  # type: ignore
-
-    def setter(self, __fset: classmethod[T1, P, None] | Callable[[T1, T2], None]) -> classproperty[P, R, T1, T2, P0]:
-        self.fset = self._wrap(__fset)  # type: ignore
-        return self  # type: ignore
-
-    def deleter(self, __fdel: classmethod[T1, P1, None] | Callable[P1, None]) -> classproperty[P, R, T, T0, P1]:
-        self.fdel = self._wrap(__fdel)  # type: ignore
-        return self  # type: ignore
-
-    def __get__(self, __obj: Any, __type: type | None = None) -> R:
+    def __get__(self, __obj: T | None, __type: type | None = None) -> R:
         if __type is None:
             __type = type(__obj)
 
-        return self.fget.__get__(__obj, __type)()  # type: ignore
-
-    def __set__(self, __obj: Any, __value: Any) -> None:
-        from ..exceptions import CustomError
+        return self.fget.__get__(__obj, __type)()
 
+    def __set__(self, __obj: T, __value: Any) -> None:
         if not self.fset:
-            raise CustomError[AttributeError]("Can't set attribute")
-
-        if isclass(__obj):
-            type_, __obj = __obj, None
-        else:
-            type_ = type(__obj)
-
-        return self.fset.__get__(__obj, type_)(__value)  # type: ignore[call-arg]
+            raise AttributeError(
+                f'classproperty with getter "{self.__name__}" of "{__obj.__class__.__name__}" object has no setter.'
+            )
 
-    def __delete__(self, __obj: Any) -> None:
-        from ..exceptions import CustomError
+        self.fset.__get__(None, type(__obj))(__value)
 
+    def __delete__(self, __obj: T) -> None:
         if not self.fdel:
-            raise CustomError[AttributeError]("Can't delete attribute")
-
-        if isclass(__obj):
-            type_, __obj = __obj, None
-        else:
-            type_ = type(__obj)
+            raise AttributeError(
+                f'classproperty with getter "{self.__name__}" of "{__obj.__class__.__name__}" object has no deleter.'
+            )
 
-        return self.fdel.__delete__(__obj, type_)(__obj)  # type: ignore
+        self.fdel.__get__(None, type(__obj))()
 
+    @property
     def __name__(self) -> str:
         return self.fget.__name__
 

{jetpytools-1.3.0 → jetpytools-1.4.0}/jetpytools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jetpytools
-Version: 1.3.0
+Version: 1.4.0
 Summary: Collection of stuff that's useful in general python programming
 Author: Jaded Encoding Thaumaturgy
 Author-email: jaded.encoding.thaumaturgy@gmail.com

{jetpytools-1.3.0 → jetpytools-1.4.0}/jetpytools.egg-info/SOURCES.txt

@@ -35,4 +35,6 @@ jetpytools/utils/__init__.py
 jetpytools/utils/file.py
 jetpytools/utils/funcs.py
 jetpytools/utils/math.py
-jetpytools/utils/ranges.py
+jetpytools/utils/ranges.py
+tests/test_funcs.py
+tests/test_normalize.py

{jetpytools-1.3.0 → jetpytools-1.4.0}/setup.cfg

@@ -7,6 +7,7 @@ show-source = True
 statistics = True
 
 [mypy]
+python_version = 3.10
 ignore_missing_imports = False
 disallow_any_generics = True
 disallow_untyped_defs = True

jetpytools-1.4.0/tests/test_funcs.py

@@ -0,0 +1,12 @@
+from __future__ import annotations
+
+from jetpytools import fallback, iterate
+
+
+def test_iterate() -> None:
+    assert iterate(5, lambda x: x * 2, 2) == 20
+
+
+def test_fallback() -> None:
+    assert fallback(5, 6) == 5
+    assert fallback(None, 6) == 6

jetpytools-1.4.0/tests/test_normalize.py

@@ -0,0 +1,9 @@
+from __future__ import annotations
+
+from jetpytools import normalize_ranges
+
+
+def test_normalize_ranges() -> None:
+    assert normalize_ranges((None, None), end=1000) == [(0, 999)]
+    assert normalize_ranges((24, -24), end=1000) == [(24, 975)]
+    assert normalize_ranges([(24, 100), (80, 150)], end=1000) == [(24, 150)]