preparse 1.1.3__tar.gz → 1.1.5__tar.gz

{preparse-1.1.3 → preparse-1.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: preparse
-Version: 1.1.3
+Version: 1.1.5
 Summary: This project preparses args for further parsing later on.
 Author-email: Johannes <johannes.programming@gmail.com>
 License-Expression: MIT
@@ -19,9 +19,9 @@ Requires-Python: >=3.11
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: click<9,>=8.2
-Requires-Dist: cmp3<2,>=1.0
+Requires-Dist: cmp3<2,>=1.1
 Requires-Dist: copyable<2,>=1.1
-Requires-Dist: datahold<4,>=3.0.34.dev1
+Requires-Dist: datahold<4,>=3.0
 Requires-Dist: datarepr<2,>=1.2
 Requires-Dist: frozendict<3,>=2.4.7
 Requires-Dist: setdoc<2,>=1.3

{preparse-1.1.3 → preparse-1.1.5}/docs/v1.1.rst

@@ -172,8 +172,8 @@ This ``property`` determines the approach to the special argument ``'--'``.
 
 This method a ``dict`` representing the current instance.
 
-``warn: types.FunctionType``
-""""""""""""""""""""""""""""
+``warn: Callable[[PreparseWarning], Any]``
+""""""""""""""""""""""""""""""""""""""""""
 
 This property holds a function that is called whenever ``parse_args`` encounters a warning.
 The warning is given as the only positional arguments.

{preparse-1.1.3 → preparse-1.1.5}/pyproject.toml

@@ -19,9 +19,9 @@ classifiers = [
 ]
 dependencies = [
     "click>=8.2,<9",
-    "cmp3>=1.0,<2",
+    "cmp3>=1.1,<2",
     "copyable>=1.1,<2",
-    "datahold>=3.0.34.dev1,<4",
+    "datahold>=3.0,<4",
     "datarepr>=1.2,<2",
     "frozendict>=2.4.7,<3",
     "setdoc>=1.3,<2",
@@ -36,7 +36,7 @@ license-files = [
 name = "preparse"
 readme = "README.rst"
 requires-python = ">=3.11"
-version = "1.1.3"
+version = "1.1.5"
 
 [project.urls]
 Download = "https://pypi.org/project/preparse/#files"
@@ -50,12 +50,3 @@ files = [
 ]
 python_version = "3.11"
 strict = false
-
-[[tool.mypy.overrides]]
-module = [
-    "cmp3",
-    "cmp3.*",
-    "datahold",
-    "datahold.*",
-]
-ignore_missing_imports = true

{preparse-1.1.3 → preparse-1.1.5}/src/preparse/_processing/__init__.py

@@ -1,5 +1,6 @@
+from collections.abc import Iterable
 from types import FunctionType
-from typing import *
+from typing import Optional
 
 from preparse._items import *
 from preparse._processing.deparsing import *
@@ -13,7 +14,7 @@ __all__ = ["process"]
 
 
 def process(
-    args: Optional[Iterable] = None,
+    args: Optional[Iterable[object]] = None,
     *,
     allowslong: bool,
     allowsshort: bool,

{preparse-1.1.3 → preparse-1.1.5}/src/preparse/_processing/parsing.py

@@ -1,5 +1,6 @@
+from collections.abc import Iterable
 from types import FunctionType
-from typing import *
+from typing import Any, Generator
 
 from preparse._items.Bundle import Bundle
 from preparse._items.Item import Item
@@ -26,7 +27,7 @@ def parse_bundling(
     arg: str,
     *,
     cause: FunctionType,
-    optdict: dict,
+    optdict: dict[Any, Any],
 ) -> Bundle:
     ans: Bundle
     x: int
@@ -67,7 +68,7 @@ def parse_generator(
     allowsshort: bool,
     expectsabbr: bool,
     expectsposix: bool,
-    optdict: dict,
+    optdict: dict[Any, Any],
     prog: str,
     warn: FunctionType,
 ) -> Generator[Any, Any, Any]:
@@ -137,7 +138,7 @@ def parse_long(
     *,
     cause: FunctionType,
     expectsabbr: bool,
-    optdict: dict,
+    optdict: dict[Any, Any],
 ) -> Long:
     ans: Long
     parts: list[str]
@@ -187,7 +188,7 @@ def parse_option(
     *,
     cause: FunctionType,
     expectsabbr: bool,
-    optdict: dict,
+    optdict: dict[Any, Any],
     **kwargs: Any,
 ) -> Option:
     if parse_islong(arg, **kwargs):

{preparse-1.1.3 → preparse-1.1.5}/src/preparse/_processing/pulling.py

@@ -1,5 +1,6 @@
 import sys
-from typing import *
+from collections.abc import Iterable
+from typing import Optional
 
 from preparse._items.Item import Item
 from preparse._items.Positional import Positional
@@ -7,9 +8,9 @@ from preparse._items.Positional import Positional
 __all__ = ["pull"]
 
 
-def pull(args: Optional[Iterable] = None) -> list[Item]:
+def pull(args: Optional[Iterable[object]] = None) -> list[Item]:
     "This method acquires args."
-    argiter: Iterable
+    argiter: Iterable[object]
     if args is None:
         argiter = sys.argv[1:]
     else:

{preparse-1.1.3 → preparse-1.1.5}/src/preparse/core/Click.py

@@ -3,7 +3,8 @@ from __future__ import annotations
 import dataclasses
 import functools
 import types
-from typing import *
+from collections.abc import Callable
+from typing import TYPE_CHECKING, Any, Self
 
 import setdoc
 from copyable import Copyable

{preparse-1.1.3 → preparse-1.1.5}/src/preparse/core/Optdict.py

@@ -1,21 +1,28 @@
+from collections.abc import Hashable
 from typing import Any, Optional, Self
 
-import cmp3  # type: ignore
+import cmp3
 import datahold
 import setdoc
 from datarepr import datarepr
 from frozendict import frozendict
 
-from preparse.core.enums import *
-from preparse.core.warnings import *
+from preparse.core.enums import Nargs
 
 __all__ = ["Optdict"]
 
 
+def nargs(value: Any, /) -> Nargs:
+    if isinstance(value, int):
+        return Nargs(value)
+    else:
+        return Nargs.OPTIONAL_ARGUMENT
+
+
 class Optdict(cmp3.CmpABC, datahold.HoldDict[str, Nargs]):
     __slots__ = ()
 
-    _data: Any
+    _data: frozendict[str, Nargs]
 
     @setdoc.basic
     def __cmp__(self: Self, other: Any, /) -> Optional[int]:
@@ -28,7 +35,7 @@ class Optdict(cmp3.CmpABC, datahold.HoldDict[str, Nargs]):
 
     @setdoc.basic
     def __init__(self: Self, data: Any = (), /) -> None:
-        datahold.HoldDict[str, Nargs].__init__(self, data)
+        datahold.HoldDict.__init__(self, data)
 
     @setdoc.basic
     def __repr__(self: Self, /) -> str:
@@ -36,16 +43,16 @@ class Optdict(cmp3.CmpABC, datahold.HoldDict[str, Nargs]):
 
     __str__ = object.__str__
 
-    @property
+    @property  # type: ignore[override]
     def data(self: Self) -> frozendict[str, Nargs]:
-        return frozendict[str, Nargs](self._data)
+        return frozendict(self._data)
 
     @data.setter
     def data(self: Self, value: Any) -> None:
-        a: frozendict
+        a: frozendict[Hashable, object]
         x: map
         y: map
         a = frozendict(value)
         x = map(str, a.keys())
-        y = map(Nargs, a.values())
+        y = map(nargs, a.values())
         self._data = frozendict(zip(x, y, strict=True))

{preparse-1.1.3 → preparse-1.1.5}/src/preparse/core/PreParser.py

@@ -2,21 +2,21 @@ from __future__ import annotations
 
 import os
 import sys
-import types
-from typing import *
+from collections.abc import Callable, Iterable
+from typing import Any, Optional, Self, cast
 
 import click as cl
 import setdoc
 from copyable import Copyable
-from datarepr import datarepr
-from tofunc import tofunc
+from datarepr import datarepr  # type: ignore[attr-defined]
+from tofunc import tofunc  # type: ignore[attr-defined]
 
 from preparse._processing import *
 from preparse._utils.dataprop import dataprop
 from preparse.core.Click import Click
 from preparse.core.enums import *
 from preparse.core.Optdict import Optdict
-from preparse.core.warnings import *
+from preparse.core.warnings import PreparseWarning
 
 __all__ = ["PreParser"]
 
@@ -39,7 +39,7 @@ class PreParser(Copyable):
         prog: Any = None,
         reconcilesorders: Any = True,
         special: Any = Tuning.MAINTAIN,
-        warn: Callable = str,
+        warn: Callable = str,  # type: ignore[type-arg]
     ) -> None:
         self._data: dict[str, Any]
         self._data = dict()
@@ -68,7 +68,7 @@ class PreParser(Copyable):
         return bool(value)
 
     @dataprop
-    def bundling(self: Self, value: Any) -> Tuning:
+    def bundling(self: Self, value: int) -> Tuning:
         "This property decides how to approach the bundling of short options."
         return Tuning(value)
 
@@ -104,11 +104,11 @@ class PreParser(Copyable):
         dataA = Optdict(value)
         self._data["optdict"].clear()
         self._data["optdict"].update(dataA)
-        return self._data["optdict"]
+        return cast(Optdict, self._data["optdict"])
 
     def parse_args(
         self: Self,
-        args: Optional[Iterable] = None,
+        args: Optional[Iterable[object]] = None,
     ) -> list[str]:
         "This method parses args."
         return process(args, **self.todict())
@@ -151,7 +151,7 @@ class PreParser(Copyable):
         self.prog = ctx.info_name
 
     @dataprop
-    def special(self: Self, value: Any) -> Tuning:
+    def special(self: Self, value: int) -> Tuning:
         "This Tuning property determines the approach towards the special argument."
         return Tuning(value)
 
@@ -167,6 +167,9 @@ class PreParser(Copyable):
             return dict(ans)
 
     @dataprop
-    def warn(self: Self, value: Callable) -> types.FunctionType:
+    def warn(
+        self: Self,
+        value: Callable[[PreparseWarning], Any],
+    ) -> Callable[[PreparseWarning], Any]:
         "This property gives a function that takes in the warnings."
         return tofunc(value)

{preparse-1.1.3 → preparse-1.1.5}/src/preparse/core/enums.py

@@ -5,7 +5,7 @@ between the values zero, meaning no, and one, meaning yes."""
 
 import enum
 import operator
-from typing import *
+from typing import Self
 
 __all__ = [
     "Tuning",
@@ -15,8 +15,7 @@ __all__ = [
 
 class BaseEnum(enum.IntEnum):
     @classmethod
-    def _missing_(cls: type, value: Any) -> Any:
-        operator.index(value)
+    def _missing_(cls: type[Self], value: object) -> Self:
         return cls(2)
 
 

{preparse-1.1.3 → preparse-1.1.5}/src/preparse/core/warnings.py

@@ -1,5 +1,6 @@
 from abc import abstractmethod
-from typing import *
+from collections.abc import Iterable
+from typing import Any, Self
 
 import setdoc
 from copyable import Copyable
@@ -113,7 +114,7 @@ class PreparseAmbiguousOptionWarning(PreparseLongonlyWarning):
 
     @setdoc.basic
     def __init__(
-        self: Self, *, prog: Any, option: Any, possibilities: Iterable
+        self: Self, *, prog: Any, option: Any, possibilities: Iterable[object]
     ) -> None:
         self.prog = prog
         self.option = option
@@ -129,7 +130,7 @@ class PreparseAmbiguousOptionWarning(PreparseLongonlyWarning):
         return ans
 
     @dataprop
-    def possibilities(self: Self, value: Iterable) -> tuple[str, ...]:
+    def possibilities(self: Self, value: Iterable[object]) -> tuple[str, ...]:
         return tuple(map(str, value))
 
 

{preparse-1.1.3 → preparse-1.1.5}/src/preparse/tests/test_data_toml.py

@@ -35,7 +35,7 @@ class TestDataToml(unittest.TestCase):
     def test_0(self: Self) -> None:
         data: dict[str, Any]
         name: str
-        kwargs: dict
+        kwargs: dict[str, Any]
         data = Utils.utils.get_data()
         for name, kwargs in data.items():
             with self.subTest(msg=name, **kwargs):
@@ -49,12 +49,12 @@ class TestDataToml(unittest.TestCase):
         warnings: Any,
         **kwargs: Any,
     ) -> None:
-        answer: list
-        capture: list
-        data: dict
-        erranswer: list
+        answer: list[Any]
+        capture: list[Any]
+        data: dict[str, Any]
+        erranswer: list[Any]
         msg: str
-        superanswer: list
+        superanswer: list[Any]
         parser: PreParser
         capture = list()
 

{preparse-1.1.3 → preparse-1.1.5}/src/preparse/tests/test_enums.py

@@ -1,5 +1,5 @@
 import unittest
-from typing import *
+from typing import Self
 
 from preparse.core.enums import *
 

{preparse-1.1.3 → preparse-1.1.5}/src/preparse/tests/test_expit_toml.py

@@ -3,7 +3,7 @@ import math
 import tomllib
 import unittest
 from importlib import resources
-from typing import *
+from typing import Any, Self
 
 from click.testing import CliRunner
 
@@ -17,8 +17,8 @@ class Utils(enum.Enum):
     utils = None
 
     @staticmethod
-    def get_data() -> dict:
-        data: dict
+    def get_data() -> dict[Any, Any]:
+        data: dict[Any, Any]
         text: str
         text = resources.read_text("preparse.tests", "expit.toml")
         data = tomllib.loads(text)
@@ -45,7 +45,7 @@ class TestMainFunction(unittest.TestCase):
         stdout: Any,
         stderr: Any,
     ) -> None:
-        extra: dict
+        extra: dict[Any, Any]
         result: Any
         runner: CliRunner
         runner = CliRunner()
@@ -65,8 +65,8 @@ class TestMainFunction(unittest.TestCase):
             self.assertEqual(stderr, result.stderr)
 
     def test_0(self: Self) -> None:
-        data: dict
-        kwargs: dict
+        data: dict[Any, Any]
+        kwargs: dict[Any, Any]
         name: str
         data = Utils.utils.get_data()
         for name, kwargs in data.items():

{preparse-1.1.3 → preparse-1.1.5}/src/preparse/tests/test_optdict.py

@@ -1,5 +1,5 @@
 import unittest
-from typing import *
+from typing import Self
 
 from preparse.core.enums import *
 from preparse.core.Optdict import Optdict

{preparse-1.1.3 → preparse-1.1.5}/src/preparse/tests/test_preparser.py

@@ -1,5 +1,5 @@
 import unittest
-from typing import *
+from typing import Any, Self
 
 from preparse.core.Click import Click
 from preparse.core.enums import *
@@ -29,7 +29,7 @@ class TestPreParser(unittest.TestCase):
         self.assertEqual(parser.optdict, parser_copy.optdict)
 
     def test_preparser_todict(self: Self) -> None:
-        expected_keys: list
+        expected_keys: list[Any]
         parser: PreParser
         result: Any
         parser = PreParser()

{preparse-1.1.3 → preparse-1.1.5}/src/preparse.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: preparse
-Version: 1.1.3
+Version: 1.1.5
 Summary: This project preparses args for further parsing later on.
 Author-email: Johannes <johannes.programming@gmail.com>
 License-Expression: MIT
@@ -19,9 +19,9 @@ Requires-Python: >=3.11
 Description-Content-Type: text/x-rst
 License-File: LICENSE.txt
 Requires-Dist: click<9,>=8.2
-Requires-Dist: cmp3<2,>=1.0
+Requires-Dist: cmp3<2,>=1.1
 Requires-Dist: copyable<2,>=1.1
-Requires-Dist: datahold<4,>=3.0.34.dev1
+Requires-Dist: datahold<4,>=3.0
 Requires-Dist: datarepr<2,>=1.2
 Requires-Dist: frozendict<3,>=2.4.7
 Requires-Dist: setdoc<2,>=1.3

{preparse-1.1.3 → preparse-1.1.5}/src/preparse.egg-info/requires.txt

@@ -1,7 +1,7 @@
 click<9,>=8.2
-cmp3<2,>=1.0
+cmp3<2,>=1.1
 copyable<2,>=1.1
-datahold<4,>=3.0.34.dev1
+datahold<4,>=3.0
 datarepr<2,>=1.2
 frozendict<3,>=2.4.7
 setdoc<2,>=1.3