-
Notifications
You must be signed in to change notification settings - Fork 6
Windows: add guards for some methods that don't work/exist on windows #295
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.
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
Tom-Willemsen
wants to merge
2
commits into
DiamondLightSource:main
Choose a base branch
from
Tom-Willemsen:guard_methods_that_dont_work_on_windows
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,6 @@ | ||
| import getpass | ||
| import os | ||
| import sys | ||
| from enum import StrEnum | ||
| from logging import LogRecord | ||
| from typing import TYPE_CHECKING, Any | ||
|
|
@@ -30,8 +31,16 @@ def _configure_logger( | |
| graylog_env_fields: GraylogEnvFields | None = None, | ||
| ): | ||
| logger.remove() | ||
|
|
||
| try: | ||
| out = StdoutProxy(raw=True) | ||
| except Exception: | ||
| # e.g. prompt_toolkit.output.win32.NoConsoleScreenBufferError on windows | ||
| # But it isn't exported from prompt_toolkit in a cross-platform way. | ||
| out = sys.stdout | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could we log a warning that we are using raw stdout? I guess it will have to do it after the logger sink is added by isinstance checking the sink. |
||
|
|
||
| logger.add( | ||
| sink=StdoutProxy(raw=True), # type: ignore | ||
| sink=out, # type: ignore | ||
| colorize=True, | ||
| format=format_record, | ||
| level=level or "INFO", | ||
|
|
||
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would prefer either
stdoutorsinkfor this variable name