mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-05-03 08:52:55 +00:00
[PR #11222/c7f6a28d backport][stable-12] Add basic typing for module_utils (#11243)
Add basic typing for module_utils (#11222) * Add basic typing for module_utils. * Apply some suggestions. * Make pass again. * Add more types as suggested. * Normalize extra imports. * Add more type hints. * Improve typing. * Add changelog fragment. * Reduce changelog. * Apply suggestions from code review. * Fix typo. * Cleanup. * Improve types and make type checking happy. * Let's see whether older Pythons barf on this. * Revert "Let's see whether older Pythons barf on this." This reverts commit9973af3dbe. * Add noqa. --------- (cherry picked from commitc7f6a28d89) Co-authored-by: Felix Fontein <felix@fontein.de> Co-authored-by: Alexei Znamensky <103110+russoz@users.noreply.github.com>
This commit is contained in:
parent
a2c7f9f89a
commit
377a599372
56 changed files with 725 additions and 469 deletions
|
|
@ -7,9 +7,13 @@ from __future__ import annotations
|
|||
|
||||
import os
|
||||
import re
|
||||
import typing as t
|
||||
|
||||
if t.TYPE_CHECKING:
|
||||
from ansible.module_utils.basic import AnsibleModule
|
||||
|
||||
|
||||
def _create_regex_group_complement(s):
|
||||
def _create_regex_group_complement(s: str) -> re.Pattern:
|
||||
lines = (line.strip() for line in s.split("\n") if line.strip())
|
||||
chars = [_f for _f in (line.split("#")[0].strip() for line in lines) if _f]
|
||||
group = rf"[^{''.join(chars)}]"
|
||||
|
|
@ -52,7 +56,7 @@ class HomebrewValidate:
|
|||
|
||||
# class validations -------------------------------------------- {{{
|
||||
@classmethod
|
||||
def valid_path(cls, path):
|
||||
def valid_path(cls, path: list[str] | str) -> bool:
|
||||
"""
|
||||
`path` must be one of:
|
||||
- list of paths
|
||||
|
|
@ -77,7 +81,7 @@ class HomebrewValidate:
|
|||
return all(cls.valid_brew_path(path_) for path_ in paths)
|
||||
|
||||
@classmethod
|
||||
def valid_brew_path(cls, brew_path):
|
||||
def valid_brew_path(cls, brew_path: str | None) -> bool:
|
||||
"""
|
||||
`brew_path` must be one of:
|
||||
- None
|
||||
|
|
@ -95,7 +99,7 @@ class HomebrewValidate:
|
|||
return isinstance(brew_path, str) and not cls.INVALID_BREW_PATH_REGEX.search(brew_path)
|
||||
|
||||
@classmethod
|
||||
def valid_package(cls, package):
|
||||
def valid_package(cls, package: str | None) -> bool:
|
||||
"""A valid package is either None or alphanumeric."""
|
||||
|
||||
if package is None:
|
||||
|
|
@ -104,8 +108,7 @@ class HomebrewValidate:
|
|||
return isinstance(package, str) and not cls.INVALID_PACKAGE_REGEX.search(package)
|
||||
|
||||
|
||||
def parse_brew_path(module):
|
||||
# type: (...) -> str
|
||||
def parse_brew_path(module: AnsibleModule) -> str:
|
||||
"""Attempt to find the Homebrew executable path.
|
||||
|
||||
Requires:
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue