Skip to content

Commit

Permalink
fix: incorrect optional type hints
Browse files Browse the repository at this point in the history
Changes made with shell command:

`perl -pi -e 's/: Callable\[(.*?)\] = None/: Optional[Callable[$1]] = None/g' $(find . -type f -name '*.py')`

Which replaces ': Callable[...] = None' with ': Optional[Callable[...]] = None', where '...' can be any type.

issue: 2303
  • Loading branch information
danphenderson committed Feb 16, 2024
1 parent 99dcd81 commit 52bc2fa
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
4 changes: 2 additions & 2 deletions playwright/_impl/_browser_context.py
Original file line number Diff line number Diff line change
Expand Up @@ -548,14 +548,14 @@ async def wait_for_event(

def expect_console_message(
self,
predicate: Callable[[ConsoleMessage], bool] = None,
predicate: Optional[Callable[[ConsoleMessage], bool]] = None,
timeout: Optional[float] = None,
) -> EventContextManagerImpl[ConsoleMessage]:
return self.expect_event(Page.Events.Console, predicate, timeout)

def expect_page(
self,
predicate: Callable[[Page], bool] = None,
predicate: Optional[Callable[[Page], bool]] = None,
timeout: Optional[float] = None,
) -> EventContextManagerImpl[Page]:
return self.expect_event(BrowserContext.Events.Page, predicate, timeout)
Expand Down
14 changes: 7 additions & 7 deletions playwright/_impl/_page.py
Original file line number Diff line number Diff line change
Expand Up @@ -1142,21 +1142,21 @@ def _expect_event(

def expect_console_message(
self,
predicate: Callable[[ConsoleMessage], bool] = None,
predicate: Optional[Callable[[ConsoleMessage], bool]] = None,
timeout: Optional[float] = None,
) -> EventContextManagerImpl[ConsoleMessage]:
return self.expect_event(Page.Events.Console, predicate, timeout)

def expect_download(
self,
predicate: Callable[[Download], bool] = None,
predicate: Optional[Callable[[Download], bool]] = None,
timeout: Optional[float] = None,
) -> EventContextManagerImpl[Download]:
return self.expect_event(Page.Events.Download, predicate, timeout)

def expect_file_chooser(
self,
predicate: Callable[[FileChooser], bool] = None,
predicate: Optional[Callable[[FileChooser], bool]] = None,
timeout: Optional[float] = None,
) -> EventContextManagerImpl[FileChooser]:
return self.expect_event(Page.Events.FileChooser, predicate, timeout)
Expand All @@ -1171,7 +1171,7 @@ def expect_navigation(

def expect_popup(
self,
predicate: Callable[["Page"], bool] = None,
predicate: Optional[Callable[["Page"], bool]] = None,
timeout: Optional[float] = None,
) -> EventContextManagerImpl["Page"]:
return self.expect_event(Page.Events.Popup, predicate, timeout)
Expand Down Expand Up @@ -1208,7 +1208,7 @@ def my_predicate(request: Request) -> bool:

def expect_request_finished(
self,
predicate: Callable[["Request"], bool] = None,
predicate: Optional[Callable[["Request"], bool]] = None,
timeout: Optional[float] = None,
) -> EventContextManagerImpl[Request]:
return self.expect_event(
Expand Down Expand Up @@ -1247,14 +1247,14 @@ def my_predicate(response: Response) -> bool:

def expect_websocket(
self,
predicate: Callable[["WebSocket"], bool] = None,
predicate: Optional[Callable[["WebSocket"], bool]] = None,
timeout: Optional[float] = None,
) -> EventContextManagerImpl["WebSocket"]:
return self.expect_event("websocket", predicate, timeout)

def expect_worker(
self,
predicate: Callable[["Worker"], bool] = None,
predicate: Optional[Callable[["Worker"], bool]] = None,
timeout: Optional[float] = None,
) -> EventContextManagerImpl["Worker"]:
return self.expect_event("worker", predicate, timeout)
Expand Down

0 comments on commit 52bc2fa

Please sign in to comment.