fix: run blocking call in threadpool #780
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
playwright/_impl/_browser_context.py
Outdated
| @@ -298,8 +299,7 @@ async def _pause(self) -> None: | |||
| async def storage_state(self, path: Union[str, Path] = None) -> StorageState: | |||
| result = await self._channel.send_return_as_dict("storageState") | |||
| if path: | |||
| with open(path, "w") as f: | |||
| json.dump(result, f) | |||
| await async_writefile(path, "w", json.dumps(result)) | |||
There was a problem hiding this comment.
I was already leaving this comment, should be async_write_file(page, json.dumps(result))
There was a problem hiding this comment.
Okay but how would you write in binary with this ?
There was a problem hiding this comment.
OR you mean we should have two functions for writing one for str and one for bytes ?
There was a problem hiding this comment.
async_write_file would accept Union[str, bytes] and will pick the right mode.
There was a problem hiding this comment.
Sure! Thanks for confirming
playwright/_impl/_browser.py
Outdated
| @@ -214,5 +215,4 @@ def normalize_context_params(is_sync: bool, params: Dict) -> None: | |||
| if "storageState" in params: | |||
| storageState = params["storageState"] | |||
| if not isinstance(storageState, dict): | |||
| with open(storageState, "r") as f: | |||
| params["storageState"] = json.load(f) | |||
| params["storageState"] = json.loads(await async_read_text(storageState)) | |||
There was a problem hiding this comment.
(await async_read_file()).decode()
playwright/_impl/_element_handle.py
Outdated
| @@ -241,8 +242,7 @@ async def screenshot( | |||
| decoded_binary = base64.b64decode(encoded_binary) | |||
| if path: | |||
| make_dirs_for_file(path) | |||
| with open(path, "wb") as fd: | |||
| fd.write(decoded_binary) | |||
| await async_writefile(path, "wb", decoded_binary) | |||
playwright/_impl/_file_chooser.py
Outdated
| file_payloads.append( | ||
| { | ||
| "name": os.path.basename(item), | ||
| "buffer": base64.b64encode(await async_read_binary(item)).decode(), |
playwright/_impl/_helper.py
Outdated
| await loop.run_in_executor(None, inner) | ||
|
|
||
|
|
||
| async def async_read_binary(file: Union[str, Path]) -> bytes: |
playwright/_impl/_helper.py
Outdated
|
|
||
|
|
||
| async def async_read_text(file: Union[str, Path]) -> str: | ||
| return (await async_read_binary(file)).decode() |
There was a problem hiding this comment.
inline this, no reason to have a separate function.
pavelfeldman
approved these changes
Jul 2, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.