monorail
/
Archipelago
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Core: Fix OptionList and OptionSet to allow Iterable of Iterable (#2911) 

* fix, maybe

* typegard for iterable of any

* wow I'm so tired I just changed the method name without changing what it actually does...

* also exclude bytes in is_iterable_but_str

* apply pr comments

* Update Utils.py

Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com>

* Revert "also exclude bytes in is_iterable_but_str"

This reverts commit cf087d2ee20727dbbe561c8c0f90aa85ef0a5d4b.

---------

Co-authored-by: Doug Hoskisson <beauxq@users.noreply.github.com>
This commit is contained in:
Jérémie Bolduc 2024-03-11 19:30:14 -04:00 committed by GitHub
parent d3019421de
commit a3125cb06e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Options.py
View File

@ -12,7 +12,7 @@ from dataclasses import dataclass
from schema import And, Optional, Or, Schema from schema import And, Optional, Or, Schema
from Utils import get_fuzzy_results, is_iterable_of_str from Utils import get_fuzzy_results, is_iterable_except_str
if typing.TYPE_CHECKING: if typing.TYPE_CHECKING:
from BaseClasses import PlandoOptions from BaseClasses import PlandoOptions
@ -847,7 +847,7 @@ class OptionList(Option[typing.List[typing.Any]], VerifyKeys):
default: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any, ...]] = () default: typing.Union[typing.List[typing.Any], typing.Tuple[typing.Any, ...]] = ()
supports_weighting = False supports_weighting = False
def __init__(self, value: typing.Iterable[str]): def __init__(self, value: typing.Iterable[typing.Any]):
self.value = list(deepcopy(value)) self.value = list(deepcopy(value))
super(OptionList, self).__init__() super(OptionList, self).__init__()
@ -857,7 +857,7 @@ class OptionList(Option[typing.List[typing.Any]], VerifyKeys):
@classmethod @classmethod
def from_any(cls, data: typing.Any): def from_any(cls, data: typing.Any):
if is_iterable_of_str(data): if is_iterable_except_str(data):
cls.verify_keys(data) cls.verify_keys(data)
return cls(data) return cls(data)
return cls.from_text(str(data)) return cls.from_text(str(data))
@ -883,7 +883,7 @@ class OptionSet(Option[typing.Set[str]], VerifyKeys):
@classmethod @classmethod
def from_any(cls, data: typing.Any): def from_any(cls, data: typing.Any):
if is_iterable_of_str(data): if is_iterable_except_str(data):
cls.verify_keys(data) cls.verify_keys(data)
return cls(data) return cls(data)
return cls.from_text(str(data)) return cls.from_text(str(data))

11
Utils.py
View File

@ -713,7 +713,7 @@ def messagebox(title: str, text: str, error: bool = False) -> None:
import ctypes import ctypes
style = 0x10 if error else 0x0 style = 0x10 if error else 0x0
return ctypes.windll.user32.MessageBoxW(0, text, title, style) return ctypes.windll.user32.MessageBoxW(0, text, title, style)
# fall back to tk # fall back to tk
try: try:
import tkinter import tkinter
@ -969,11 +969,8 @@ class RepeatableChain:
return sum(len(iterable) for iterable in self.iterable) return sum(len(iterable) for iterable in self.iterable)
def is_iterable_of_str(obj: object) -> TypeGuard[typing.Iterable[str]]: def is_iterable_except_str(obj: object) -> TypeGuard[typing.Iterable[typing.Any]]:
""" but not a `str` (because technically, `str` is `Iterable[str]`) """ """ `str` is `Iterable`, but that's not what we want """
if isinstance(obj, str): if isinstance(obj, str):
return False return False
if not isinstance(obj, typing.Iterable): return isinstance(obj, typing.Iterable)
return False
obj_it: typing.Iterable[object] = obj
return all(isinstance(v, str) for v in obj_it)