Skip to content
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

Jump to bottom

chore(roll): roll Playwright to 1.38.0 #2075

Merged
merged 2 commits into from
Sep 15, 2023
Merged

chore(roll): roll Playwright to 1.38.0 #2075

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
6a5c1d2
chore(roll): roll Playwright to 1.38.0
mxschmitt Sep 15, 2023
d76312b
revert support
mxschmitt Sep 15, 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
4 changes: 2 additions & 2 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ Playwright is a Python library to automate [Chromium](https://www.chromium.org/H

| | Linux | macOS | Windows |
| :--- | :---: | :---: | :---: |
| Chromium <!-- GEN:chromium-version -->117.0.5938.35<!-- GEN:stop --> | ✅ | ✅ | ✅ |
| Chromium <!-- GEN:chromium-version -->117.0.5938.62<!-- GEN:stop --> | ✅ | ✅ | ✅ |
| WebKit <!-- GEN:webkit-version -->17.0<!-- GEN:stop --> | ✅ | ✅ | ✅ |
| Firefox <!-- GEN:firefox-version -->115.0<!-- GEN:stop --> | ✅ | ✅ | ✅ |
| Firefox <!-- GEN:firefox-version -->117.0<!-- GEN:stop --> | ✅ | ✅ | ✅ |

## Documentation

Expand Down
6 changes: 3 additions & 3 deletions playwright/_impl/_browser_context.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,9 @@
)
from playwright._impl._network import Request, Response, Route, serialize_headers
from playwright._impl._page import BindingCall, Page, Worker
from playwright._impl._page_error import PageError
from playwright._impl._tracing import Tracing
from playwright._impl._wait_helper import WaitHelper
from playwright._impl._web_error import WebError

if TYPE_CHECKING: # pragma: no cover
from playwright._impl._browser import Browser
Expand All @@ -89,7 +89,7 @@ class BrowserContext(ChannelOwner):
Console="console",
Dialog="dialog",
Page="page",
PageError="pageerror",
WebError="weberror",
ServiceWorker="serviceworker",
Request="request",
Response="response",
Expand Down Expand Up @@ -567,7 +567,7 @@ def _on_dialog(self, dialog: Dialog) -> None:
asyncio.create_task(dialog.dismiss())

async def _on_page_error(self, error: Error, page: Optional[Page]) -> None:
self.emit(BrowserContext.Events.PageError, PageError(self._loop, page, error))
self.emit(BrowserContext.Events.WebError, WebError(self._loop, page, error))
if page:
page.emit(Page.Events.PageError, error)

Expand Down
10 changes: 10 additions & 0 deletions playwright/_impl/_js_handle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,16 @@ def parse_value(value: Any, refs: Optional[Dict[int, Any]] = None) -> Any:
if "bi" in value:
return int(value["bi"])

if "m" in value:
v = {}
refs[value["m"]["id"]] = v
return v

if "se" in value:
v = set()
refs[value["se"]["id"]] = v
return v

if "a" in value:
a: List = []
refs[value["id"]] = a
Expand Down
2 changes: 1 addition & 1 deletion playwright/_impl/_page_error.py → playwright/_impl/_web_error.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
from playwright._impl._page import Page


class PageError:
class WebError:
def __init__(
self, loop: AbstractEventLoop, page: Optional[Page], error: Error
) -> None:
Expand Down
37 changes: 21 additions & 16 deletions playwright/async_api/_generated.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,11 +79,11 @@
from playwright._impl._network import WebSocket as WebSocketImpl
from playwright._impl._page import Page as PageImpl
from playwright._impl._page import Worker as WorkerImpl
from playwright._impl._page_error import PageError as PageErrorImpl
from playwright._impl._playwright import Playwright as PlaywrightImpl
from playwright._impl._selectors import Selectors as SelectorsImpl
from playwright._impl._tracing import Tracing as TracingImpl
from playwright._impl._video import Video as VideoImpl
from playwright._impl._web_error import WebError as WebErrorImpl


class Request(AsyncBase):
Expand Down Expand Up @@ -1302,6 +1302,9 @@ async def insert_text(self, text: str) -> None:
async def type(self, text: str, *, delay: typing.Optional[float] = None) -> None:
"""Keyboard.type

**NOTE** In most cases, you should use `locator.fill()` instead. You only need to press keys one by one if
there is special keyboard handling on the page - in this case use `locator.press_sequentially()`.

Sends a `keydown`, `keypress`/`input`, and `keyup` event for each character in the text.

To press a special key, like `Control` or `ArrowDown`, use `keyboard.press()`.
Expand Down Expand Up @@ -1337,6 +1340,8 @@ async def type(self, text: str, *, delay: typing.Optional[float] = None) -> None
async def press(self, key: str, *, delay: typing.Optional[float] = None) -> None:
"""Keyboard.press

**NOTE** In most cases, you should use `locator.press()` instead.

`key` can specify the intended
[keyboardEvent.key](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key) value or a single character
to generate the text for. A superset of the `key` values can be found
Expand Down Expand Up @@ -2335,7 +2340,7 @@ async def fill(
[control](https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement/control), the control will be filled
instead.

To send fine-grained keyboard events, use `keyboard.type()`.
To send fine-grained keyboard events, use `locator.press_sequentially()`.

Parameters
----------
Expand Down Expand Up @@ -4633,7 +4638,7 @@ async def fill(
[control](https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement/control), the control will be filled
instead.

To send fine-grained keyboard events, use `frame.type()`.
To send fine-grained keyboard events, use `locator.press_sequentially()`.

Parameters
----------
Expand Down Expand Up @@ -10278,7 +10283,7 @@ async def fill(
[control](https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement/control), the control will be filled
instead.

To send fine-grained keyboard events, use `page.type()`.
To send fine-grained keyboard events, use `locator.press_sequentially()`.

Parameters
----------
Expand Down Expand Up @@ -12484,10 +12489,10 @@ async def set_checked(
mapping.register(PageImpl, Page)


class PageError(AsyncBase):
class WebError(AsyncBase):
@property
def page(self) -> typing.Optional["Page"]:
"""PageError.page
"""WebError.page

The page that produced this unhandled exception, if any.

Expand All @@ -12499,7 +12504,7 @@ def page(self) -> typing.Optional["Page"]:

@property
def error(self) -> "Error":
"""PageError.error
"""WebError.error

Unhandled error that was thrown.

Expand All @@ -12510,7 +12515,7 @@ def error(self) -> "Error":
return mapping.from_impl(self._impl_obj.error)


mapping.register(PageErrorImpl, PageError)
mapping.register(WebErrorImpl, WebError)


class BrowserContext(AsyncContextManager):
Expand Down Expand Up @@ -12639,12 +12644,12 @@ def on(
@typing.overload
def on(
self,
event: Literal["pageerror"],
f: typing.Callable[["PageError"], "typing.Union[typing.Awaitable[None], None]"],
event: Literal["weberror"],
f: typing.Callable[["WebError"], "typing.Union[typing.Awaitable[None], None]"],
) -> None:
"""
Emitted when unhandled exceptions occur on any pages created through this context. To only listen for `pageError`
events from a particular page, use `page.on('page_error')`."""
Emitted when exception is unhandled in any of the pages in this context. To listen for errors from a particular
page, use `page.on('page_error')` instead."""

@typing.overload
def on(
Expand Down Expand Up @@ -12838,12 +12843,12 @@ def once(
@typing.overload
def once(
self,
event: Literal["pageerror"],
f: typing.Callable[["PageError"], "typing.Union[typing.Awaitable[None], None]"],
event: Literal["weberror"],
f: typing.Callable[["WebError"], "typing.Union[typing.Awaitable[None], None]"],
) -> None:
"""
Emitted when unhandled exceptions occur on any pages created through this context. To only listen for `pageError`
events from a particular page, use `page.on('page_error')`."""
Emitted when exception is unhandled in any of the pages in this context. To listen for errors from a particular
page, use `page.on('page_error')` instead."""

@typing.overload
def once(
Expand Down
33 changes: 19 additions & 14 deletions playwright/sync_api/_generated.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@
from playwright._impl._network import WebSocket as WebSocketImpl
from playwright._impl._page import Page as PageImpl
from playwright._impl._page import Worker as WorkerImpl
from playwright._impl._page_error import PageError as PageErrorImpl
from playwright._impl._playwright import Playwright as PlaywrightImpl
from playwright._impl._selectors import Selectors as SelectorsImpl
from playwright._impl._sync_base import (
Expand All @@ -84,6 +83,7 @@
)
from playwright._impl._tracing import Tracing as TracingImpl
from playwright._impl._video import Video as VideoImpl
from playwright._impl._web_error import WebError as WebErrorImpl


class Request(SyncBase):
Expand Down Expand Up @@ -1300,6 +1300,9 @@ def insert_text(self, text: str) -> None:
def type(self, text: str, *, delay: typing.Optional[float] = None) -> None:
"""Keyboard.type

**NOTE** In most cases, you should use `locator.fill()` instead. You only need to press keys one by one if
there is special keyboard handling on the page - in this case use `locator.press_sequentially()`.

Sends a `keydown`, `keypress`/`input`, and `keyup` event for each character in the text.

To press a special key, like `Control` or `ArrowDown`, use `keyboard.press()`.
Expand Down Expand Up @@ -1335,6 +1338,8 @@ def type(self, text: str, *, delay: typing.Optional[float] = None) -> None:
def press(self, key: str, *, delay: typing.Optional[float] = None) -> None:
"""Keyboard.press

**NOTE** In most cases, you should use `locator.press()` instead.

`key` can specify the intended
[keyboardEvent.key](https://developer.mozilla.org/en-US/docs/Web/API/KeyboardEvent/key) value or a single character
to generate the text for. A superset of the `key` values can be found
Expand Down Expand Up @@ -2353,7 +2358,7 @@ def fill(
[control](https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement/control), the control will be filled
instead.

To send fine-grained keyboard events, use `keyboard.type()`.
To send fine-grained keyboard events, use `locator.press_sequentially()`.

Parameters
----------
Expand Down Expand Up @@ -4721,7 +4726,7 @@ def fill(
[control](https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement/control), the control will be filled
instead.

To send fine-grained keyboard events, use `frame.type()`.
To send fine-grained keyboard events, use `locator.press_sequentially()`.

Parameters
----------
Expand Down Expand Up @@ -10354,7 +10359,7 @@ def fill(
[control](https://developer.mozilla.org/en-US/docs/Web/API/HTMLLabelElement/control), the control will be filled
instead.

To send fine-grained keyboard events, use `page.type()`.
To send fine-grained keyboard events, use `locator.press_sequentially()`.

Parameters
----------
Expand Down Expand Up @@ -12594,10 +12599,10 @@ def set_checked(
mapping.register(PageImpl, Page)


class PageError(SyncBase):
class WebError(SyncBase):
@property
def page(self) -> typing.Optional["Page"]:
"""PageError.page
"""WebError.page

The page that produced this unhandled exception, if any.

Expand All @@ -12609,7 +12614,7 @@ def page(self) -> typing.Optional["Page"]:

@property
def error(self) -> "Error":
"""PageError.error
"""WebError.error

Unhandled error that was thrown.

Expand All @@ -12620,7 +12625,7 @@ def error(self) -> "Error":
return mapping.from_impl(self._impl_obj.error)


mapping.register(PageErrorImpl, PageError)
mapping.register(WebErrorImpl, WebError)


class BrowserContext(SyncContextManager):
Expand Down Expand Up @@ -12732,11 +12737,11 @@ def on(self, event: Literal["page"], f: typing.Callable[["Page"], "None"]) -> No

@typing.overload
def on(
self, event: Literal["pageerror"], f: typing.Callable[["PageError"], "None"]
self, event: Literal["weberror"], f: typing.Callable[["WebError"], "None"]
) -> None:
"""
Emitted when unhandled exceptions occur on any pages created through this context. To only listen for `pageError`
events from a particular page, use `page.on('page_error')`."""
Emitted when exception is unhandled in any of the pages in this context. To listen for errors from a particular
page, use `page.on('page_error')` instead."""

@typing.overload
def on(
Expand Down Expand Up @@ -12901,11 +12906,11 @@ def once(

@typing.overload
def once(
self, event: Literal["pageerror"], f: typing.Callable[["PageError"], "None"]
self, event: Literal["weberror"], f: typing.Callable[["WebError"], "None"]
) -> None:
"""
Emitted when unhandled exceptions occur on any pages created through this context. To only listen for `pageError`
events from a particular page, use `page.on('page_error')`."""
Emitted when exception is unhandled in any of the pages in this context. To listen for errors from a particular
page, use `page.on('page_error')` instead."""

@typing.overload
def once(
Expand Down
6 changes: 3 additions & 3 deletions scripts/generate_api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,11 +51,11 @@
from playwright._impl._locator import FrameLocator, Locator
from playwright._impl._network import Request, Response, Route, WebSocket
from playwright._impl._page import Page, Worker
from playwright._impl._page_error import PageError
from playwright._impl._playwright import Playwright
from playwright._impl._selectors import Selectors
from playwright._impl._tracing import Tracing
from playwright._impl._video import Video
from playwright._impl._web_error import WebError


def process_type(value: Any, param: bool = False) -> str:
Expand Down Expand Up @@ -240,7 +240,7 @@ def return_value(value: Any) -> List[str]:
from playwright._impl._js_handle import JSHandle as JSHandleImpl
from playwright._impl._network import Request as RequestImpl, Response as ResponseImpl, Route as RouteImpl, WebSocket as WebSocketImpl
from playwright._impl._page import Page as PageImpl, Worker as WorkerImpl
from playwright._impl._page_error import PageError as PageErrorImpl
from playwright._impl._web_error import WebError as WebErrorImpl
from playwright._impl._playwright import Playwright as PlaywrightImpl
from playwright._impl._selectors import Selectors as SelectorsImpl
from playwright._impl._video import Video as VideoImpl
Expand Down Expand Up @@ -273,7 +273,7 @@ def return_value(value: Any) -> List[str]:
Download,
Video,
Page,
PageError,
WebError,
BrowserContext,
CDPSession,
Browser,
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
InWheel = None
from wheel.bdist_wheel import bdist_wheel as BDistWheelCommand

driver_version = "1.38.0-alpha-sep-4-2023"
driver_version = "1.38.0"


def extractall(zip: zipfile.ZipFile, path: str) -> None:
Expand Down
2 changes: 1 addition & 1 deletion tests/async/test_browsercontext_events.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,7 @@ async def test_console_event_should_work_with_context_manager(page: Page) -> Non


async def test_page_error_event_should_work(page: Page) -> None:
async with page.context.expect_event("pageerror") as page_error_info:
async with page.context.expect_event("weberror") as page_error_info:
await page.set_content('<script>throw new Error("boom")</script>')
page_error = await page_error_info.value
assert page_error.page == page
Expand Down
8 changes: 8 additions & 0 deletions tests/async/test_evaluate.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,14 @@ async def test_evaluate_transfer_bigint(page: Page) -> None:
assert await page.evaluate("a => a", 17) == 17


async def test_should_transfer_maps(page):
assert await page.evaluate("() => new Map([[1, { test: 42n }]])") == {}
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@mxschmitt Hi, does this mean playwright-python doesn't support transfering Map or Set actually?

Map(1) { 1 => { test: 42n } }
Set(2) { 1, { test: 42n } }

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi yes, we decided to not implement Map/Set in the language ports for now. (Then last 2 years nobody asked for it)

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for sharing about the decision :)



async def test_should_transfer_sets(page):
assert await page.evaluate("() => new Set([1, { test: 42n }])") == set()


async def test_evaluate_return_undefined_for_objects_with_symbols(page):
assert await page.evaluate('[Symbol("foo4")]') == [None]
assert (
Expand Down
Loading