Skip to content

Fix python 3.10+ errors #55

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

Open
tlg wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Fix python 3.10+ errors #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7650e7
Update type_util.py
tlg May 9, 2023
768063c
Fix python 3.10 error
tlg May 9, 2023
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
2 changes: 1 addition & 1 deletion src/mixt/codec/register.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def pyxl_transform(stream):
traceback.print_exc()
raise

return output.rstrip()
return output

def pyxl_transform_string(input):
stream = io.StringIO(bytes(input).decode('utf-8'))
Expand Down
6 changes: 3 additions & 3 deletions src/mixt/vendor/pytypes/type_util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -482,7 +482,7 @@ def is_iterator(obj):
it does not check w.r.t. (capital) Iterator class from
typing.
"""
return isinstance(obj, collections.Iterator)
return isinstance(obj, collections.abc.Iterator)

def is_Type(tp):
"""Python version independent check if an object is a type.
Expand Down Expand Up @@ -2247,7 +2247,7 @@ def _make_iterator_error_message(tp, itr, expected_tp, incomp_text,
type_str(tp, bound_Generic=bound_Generic, bound_typevars=bound_typevars))


class _typechecked_Iterable(collections.Iterable):
class _typechecked_Iterable(collections.abc.Iterable):
def __init__(self, iter_obj, cls, bound_Generic, bound_typevars,
bound_typevars_readonly, follow_fwd_refs, _recursion_check, force):
if not hasattr(iter_obj, '__iter__'):
Expand All @@ -2272,7 +2272,7 @@ def __getattr__(self, name):
return getattr(self.iter_obj, name)


class _typechecked_Iterator(collections.Iterator, _typechecked_Iterable):
class _typechecked_Iterator(collections.abc.Iterator, _typechecked_Iterable):
def __init__(self, iter_obj, cls, bound_Generic, bound_typevars,
bound_typevars_readonly, follow_fwd_refs, _recursion_check, force):
if not hasattr(iter_obj, '__iter__'):
Expand Down