Skip to content

Commit

Permalink
Merge branch 'master' into 22.4.x
Browse files Browse the repository at this point in the history
  • Loading branch information
tristanlatr committed Mar 31, 2022
2 parents a046a26 + c0a480d commit 2dd6aeb
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 4 deletions.
4 changes: 2 additions & 2 deletions pydoctor/templatewriter/__init__.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
"""Render pydoctor data as HTML."""
from typing import Iterable, Iterator, Optional, Union, cast, TYPE_CHECKING
from typing import Any, Iterable, Iterator, Optional, Union, cast, TYPE_CHECKING
if TYPE_CHECKING:
from typing_extensions import Protocol, runtime_checkable
else:
Expand All @@ -17,7 +17,7 @@ def runtime_checkable(f):
if sys.version_info >= (3, 9):
from importlib.abc import Traversable
else:
Traversable = Path
Traversable = Any
else:
Traversable = object

Expand Down
4 changes: 2 additions & 2 deletions pydoctor/test/test_templatewriter.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
from io import BytesIO
from typing import Callable, Union, cast, TYPE_CHECKING
from typing import Callable, Union, Any, cast, TYPE_CHECKING
import pytest
import warnings
import sys
Expand All @@ -23,7 +23,7 @@
if sys.version_info >= (3, 9):
from importlib.abc import Traversable
else:
Traversable = Path
Traversable = Any
else:
Traversable = object

Expand Down

0 comments on commit 2dd6aeb

Please sign in to comment.