WIP: fix types

Author: mr-c

mypy-stubs/arcp/__init__.pyi

@@ -1,5 +1,5 @@
-from .generate import arcp_hash as arcp_hash, arcp_location as arcp_location, arcp_name as arcp_name, arcp_random as arcp_random, arcp_uuid as arcp_uuid
-from .parse import is_arcp_uri as is_arcp_uri, parse_arcp as parse_arcp
+from .parse import is_arcp_uri as is_arcp_uri
+from .parse import parse_arcp as parse_arcp
 
 ARCP: str
 NI: str

mypy-stubs/arcp/generate.pyi

@@ -1,25 +1,25 @@
+from typing import Any, Tuple, Union
 from urllib.parse import ParseResult
-from typing import Any
 from uuid import NAMESPACE_URL as NAMESPACE_URL
 
 SCHEME: str
 
-def is_arcp_uri(uri: Any): ...
-def parse_arcp(uri: Any): ...
-def urlparse(uri: Any): ...
+def is_arcp_uri(uri: str) -> bool: ...
+def parse_arcp(uri: str) -> "ARCPParseResult": ...
+def urlparse(uri: str) -> Union["ARCPParseResult", ParseResult]: ...
 
 class ARCPParseResult(ParseResult):
     def __init__(self, *args: Any) -> None: ...
     @property
-    def prefix(self): ...
+    def prefix(self) -> str: ...
     @property
-    def name(self): ...
+    def name(self) -> str: ...
     @property
-    def uuid(self): ...
+    def uuid(self) -> str: ...
     @property
-    def ni(self): ...
-    def ni_uri(self, authority: str = ...): ...
-    def nih_uri(self): ...
-    def ni_well_known(self, base: str = ...): ...
+    def ni(self) -> str | None: ...
+    def ni_uri(self, authority: str = ...) -> str | None: ...
+    def nih_uri(self) -> str | None: ...
+    def ni_well_known(self, base: str = ...) -> str | None: ...
     @property
-    def hash(self): ...
+    def hash(self) -> Tuple[str, str] | None: ...

mypy-stubs/arcp/parse.pyi

@@ -1,22 +1,18 @@
-from typing import Any, Optional
 import argparse
-class CompletionFinder:
-    always_complete_options: Any = ...
-    exclude: Any = ...
-    validator: Any = ...
-    print_suppressed: Any = ...
-    completing: bool = ...
-    default_completer: Any = ...
-    append_space: Any = ...
-    def __init__(self, argument_parser: Optional[argparse.ArgumentParser] = ..., always_complete_options: bool = ..., exclude: Optional[Any] = ..., validator: Optional[Any] = ..., print_suppressed: bool = ..., default_completer: Any = ..., append_space: Optional[Any] = ...) -> None: ...
-    def __call__(self, argument_parser: argparse.ArgumentParser, always_complete_options: bool = ..., exit_method: Any = ..., output_stream: Optional[Any] = ..., exclude: Optional[Any] = ..., validator: Optional[Any] = ..., print_suppressed: bool = ..., append_space: Optional[Any] = ..., default_completer: Any = ...) -> None: ...
-    def collect_completions(self, active_parsers: Any, parsed_args: Any, cword_prefix: Any, debug: Any): ...
-    def filter_completions(self, completions: Any): ...
-    def quote_completions(self, completions: Any, cword_prequote: Any, last_wordbreak_pos: Any): ...
-    def rl_complete(self, text: Any, state: Any): ...
-    def get_display_completions(self): ...
+from typing import Any, Optional
 
-class ExclusiveCompletionFinder(CompletionFinder): ...
+class CompletionFinder:
+    def __call__(
+        self,
+        argument_parser: argparse.ArgumentParser,
+        always_complete_options: bool = ...,
+        exit_method: Any = ...,
+        output_stream: Optional[Any] = ...,
+        exclude: Optional[Any] = ...,
+        validator: Optional[Any] = ...,
+        print_suppressed: bool = ...,
+        append_space: Optional[Any] = ...,
+        default_completer: Any = ...,
+    ) -> None: ...
 
 autocomplete: CompletionFinder
-

mypy-stubs/argcomplete/__init__.pyi

@@ -1,7 +1,7 @@
 import argparse
-from typing import Any, Optional, Tuple, List, Generator, Dict
+from typing import Any, Dict, Iterator, List, Optional, Tuple
 
-def find_locale_dir(): ...
+from _typeshed import Incomplete
 
 TRANSLATION_CATALOG: Any
 MODULE_NAME: Any
@@ -15,8 +15,6 @@ HASH_BLOCK_SIZE: Any
 open_text_file: Any
 UNICODE_BYTE_ORDER_MARK: str
 
-def make_bag(bag_dir: Any, bag_info: Optional[Any] = ..., processes: int = ..., checksums: Optional[Any] = ..., checksum: Optional[Any] = ..., encoding: str = ...): ...
-
 class Bag:
     valid_files: Any = ...
     valid_directories: Any = ...
@@ -30,68 +28,23 @@ class Bag:
     path: Any = ...
     def __init__(self, path: Optional[Any] = ...) -> None: ...
     @property
-    def algs(self): ...
+    def algs(self) -> List[str]: ...
     @property
-    def version(self): ...
-    def manifest_files(self) -> None: ...
+    def version(self) -> str: ...
+    def manifest_files(self) -> Iterator[str]: ...
     def tagmanifest_files(self) -> None: ...
     def compare_manifests_with_fs(self) -> Tuple[List[str], List[str]]: ...
-    def compare_fetch_with_fs(self): ...
-    def payload_files(self) -> None: ...
-    def payload_entries(self): ...
+    def compare_fetch_with_fs(self) -> List[str]: ...
+    def payload_files(self) -> Iterator[str]: ...
+    def payload_entries(self) -> Dict[str, str]: ...
     def save(self, processes: int = ..., manifests: bool = ...) -> None: ...
-    def tagfile_entries(self): ...
-    def missing_optional_tagfiles(self) -> Generator[str, None, None]: ...
-    def fetch_entries(self) -> None: ...
-    def files_to_be_fetched(self) -> None: ...
+    def tagfile_entries(self) -> Dict[str, str]: ...
+    def missing_optional_tagfiles(self) -> Iterator[str]: ...
+    def fetch_entries(self) -> Iterator[Tuple[str, str, str]]: ...
+    def files_to_be_fetched(self) -> Iterator[str]: ...
     def has_oxum(self) -> bool: ...
-    def validate(self, processes: int = ..., fast: bool = ..., completeness_only: bool = ...): ...
-    def is_valid(self, fast: bool = ..., completeness_only: bool = ...): ...
+    def validate(
+        self, processes: int = ..., fast: bool = ..., completeness_only: bool = ...
+    ) -> bool: ...
+    def is_valid(self, fast: bool = ..., completeness_only: bool = ...) -> bool: ...
     def validate_fetch(self) -> None: ...
-
-class BagError(Exception): ...
-
-class BagValidationError(BagError):
-    message: Any = ...
-    details: Any = ...
-    def __init__(self, message: Any, details: Optional[Any] = ...) -> None: ...
-
-class ManifestErrorDetail(BagError):
-    path: Any = ...
-    def __init__(self, path: Any) -> None: ...
-
-class ChecksumMismatch(ManifestErrorDetail):
-    path: Any = ...
-    algorithm: Any = ...
-    expected: Any = ...
-    found: Any = ...
-    def __init__(self, path: Any, algorithm: Optional[Any] = ..., expected: Optional[Any] = ..., found: Optional[Any] = ...) -> None: ...
-
-class FileMissing(ManifestErrorDetail): ...
-class UnexpectedFile(ManifestErrorDetail): ...
-
-class FileNormalizationConflict(BagError):
-    file_a: Any = ...
-    file_b: Any = ...
-    def __init__(self, file_a: Any, file_b: Any) -> None: ...
-
-def posix_multiprocessing_worker_initializer() -> None: ...
-def normalize_unicode_py3(s: Any): ...
-def normalize_unicode_py2(s: Any): ...
-normalize_unicode = normalize_unicode_py3
-
-def build_unicode_normalized_lookup_dict(filenames: Any): ...
-def get_hashers(algorithms: Any): ...
-def make_manifests(data_dir: Any, processes: Any, algorithms: Any = ..., encoding: str = ...): ...
-def generate_manifest_lines(filename: Any, algorithms: Any = ...): ...
-def force_unicode_py2(s: Any): ...
-force_unicode = str
-
-class BagArgumentParser(argparse.ArgumentParser):
-    bag_info: Any = ...
-    def __init__(self, *args: Any, **kwargs: Any) -> None: ...
-
-class BagHeaderAction(argparse.Action):
-    def __call__(self, parser: Any, _: Any, values: Any, option_string: Optional[Any] = ...) -> None: ...
-
-def main() -> None: ...

mypy-stubs/bagit.pyi

@@ -6,7 +6,4 @@ from typing import Any
 
 from .wrapper import CacheControl as CacheControl
 
-# from .adapter import CacheControlAdapter as CacheControlAdapter
-# from .controller import CacheController as CacheController
-
 __email__ = ...  # type: Any

mypy-stubs/cachecontrol/__init__.pyi

@@ -1,19 +1,5 @@
-# Stubs for cachecontrol.cache (Python 2)
-#
-# NOTE: This dynamically typed stub was automatically generated by stubgen.
-
-from typing import Any
-
 class BaseCache:
-    def get(self, key): ...
-    def set(self, key, value): ...
-    def delete(self, key): ...
-    def close(self): ...
-
-class DictCache(BaseCache):
-    lock = ...  # type: Any
-    data = ...  # type: Any
-    def __init__(self, init_dict=None): ...
-    def get(self, key): ...
-    def set(self, key, value): ...
-    def delete(self, key): ...
+    def get(self, key: str) -> str | None: ...
+    def set(self, key: str, value: str) -> None: ...
+    def delete(self, key: str) -> None: ...
+    def close(self) -> None: ...

mypy-stubs/cachecontrol/adapter.pyi

@@ -1,30 +1,31 @@
-# NOTE: This dynamically typed stub was automatically generated by stubgen.
-
 from os import PathLike
-from typing import Any, Callable, Union
+from typing import ContextManager
 
 from ..cache import BaseCache as BaseCache
 from ..controller import CacheController as CacheController
 
+class _LockClass:
+    path: str
+
+_lock_class = ContextManager[_LockClass]
+
 class FileCache(BaseCache):
-    directory = ...  # type: Union[str, PathLike[str]]
-    forever = ...  # type: bool
-    filemode = ...  # type: str
-    dirmode = ...  # type: str
-    lock_class = ...  # type: Callable
+    directory: str | PathLike[str]
+    forever: bool
+    filemode: str
+    dirmode: str
+    lock_class: _lock_class
     def __init__(
         self,
-        directory: Union[str, PathLike[str]],
-        forever=False,
-        filemode=384,
-        dirmode=448,
-        use_dir_lock=None,
-        lock_class=None,
+        directory: str | PathLike[str],
+        forever: bool = ...,
+        filemode: int = ...,
+        dirmode: int = ...,
+        use_dir_lock: bool | None = ...,
+        lock_class: _lock_class | None = ...,
     ) -> None: ...
     @staticmethod
-    def encode(x): ...
-    def get(self, key): ...
-    def set(self, key, value): ...
-    def delete(self, key): ...
-
-def url_to_file_path(url, filecache): ...
+    def encode(x: str) -> str: ...
+    def get(self, key: str) -> None | str: ...
+    def set(self, key: str, value: str) -> None: ...
+    def delete(self, key: str) -> None: ...

mypy-stubs/cachecontrol/cache.pyi

@@ -1,26 +1,17 @@
-# Stubs for cachecontrol.controller (Python 2)
-#
-# NOTE: This dynamically typed stub was automatically generated by stubgen.
+from _typeshed import Incomplete
 
-from typing import Any
-
-# from .cache import DictCache as DictCache
-# from .serialize import Serializer as Serializer
-
-logger = ...  # type: Any
-URI = ...  # type: Any
-
-def parse_uri(uri): ...
+logger: Incomplete
+URI: Incomplete
 
 class CacheController:
-    cache = ...  # type: Any
-    cache_etags = ...  # type: Any
-    serializer = ...  # type: Any
-    def __init__(self, cache=None, cache_etags=True, serializer=None): ...
-    @classmethod
-    def cache_url(cls, uri): ...
-    def parse_cache_control(self, headers): ...
-    def cached_request(self, request): ...
-    def conditional_headers(self, request): ...
-    def cache_response(self, request, response, body=None): ...
-    def update_cached_response(self, request, response): ...
+    cache: Incomplete
+    cache_etags: Incomplete
+    serializer: Incomplete
+    cacheable_status_codes: Incomplete
+    def __init__(
+        self,
+        cache: Incomplete | None = ...,
+        cache_etags: bool = ...,
+        serializer: Incomplete | None = ...,
+        status_codes: Incomplete | None = ...,
+    ) -> None: ...