Skip to content

Don't require list #49

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cbornet merged 3 commits into from
May 20, 2025
Merged

Don't require list #49

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9ab2fa
Don't require list
Dreamsorcerer Apr 22, 2025
e1d9688
Update blockbuster.py
Dreamsorcerer Apr 22, 2025
2a2a68f
Update blockbuster.py
Dreamsorcerer May 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 8 additions & 13 deletions blockbuster/blockbuster.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,14 +15,14 @@
from contextvars import ContextVar
from pathlib import Path
from types import ModuleType
from typing import TYPE_CHECKING, Any, List, TypeVar, Union
from typing import TYPE_CHECKING, Any, TypeVar, Union

if TYPE_CHECKING:
import socket
import threading
from collections.abc import Callable, Iterable, Iterator
from collections.abc import Callable, Iterable, Iterator, Sequence

_ModuleList = Union[List[Union[str, ModuleType]], None]
_ModuleList = Union[Sequence[Union[str, ModuleType]], None]
_ModuleOrModuleList = Union[str, ModuleType, _ModuleList]

if platform.python_implementation() == "CPython":
Expand Down Expand Up @@ -114,7 +114,7 @@ def wrapper(*args: Any, **kwargs: Any) -> _T:
return wrapper


def _resolve_module_paths(modules: list[str | ModuleType]) -> list[str]:
def _resolve_module_paths(modules: Sequence[str | ModuleType]) -> list[str]:
resolved: list[str] = []
for module in modules:
module_ = importlib.import_module(module) if isinstance(module, str) else module
Expand Down Expand Up @@ -184,17 +184,12 @@ def __init__(
)
self.can_block_predicate: Callable[..., bool] = can_block_predicate
self.activated = False
self._scanned_modules: list[str] = []
if isinstance(scanned_modules, list):
_scanned_modules = scanned_modules
elif isinstance(scanned_modules, (str, ModuleType)):
_scanned_modules = [scanned_modules]
if isinstance(scanned_modules, (str, ModuleType)):
_scanned_modules: Sequence[str | ModuleType] = [scanned_modules]
else:
_scanned_modules = []
_scanned_modules = scanned_modules or []
self._scanned_modules = _resolve_module_paths(_scanned_modules)
self._excluded_modules: list[str] = _resolve_module_paths(
excluded_modules or []
)
self._excluded_modules = _resolve_module_paths(excluded_modules or [])

def activate(self) -> BlockBusterFunction:
"""Activate the blocking detection."""
Expand Down
Loading