tests: Improve xkeyboard-config script #503
Draft
Conversation
This file contains 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
Member
wismill
commented
Sep 5, 2024
wismill
commented
- Refactor to more modern Python
- Allow iterating over models too
- Add filter for models and options
- Add “short output” option
- Refactor to more modern Python - Allow iterating over models too - Add filter for models and options - Add “short output” option
wismill
added
enhancement
whot
reviewed
Sep 5, 2024
wismill
force-pushed
the
test/xkeyboard-config-test-enhancements
branch
from
73e1ce3
to
ab679d3
Compare
wismill
commented
Sep 6, 2024
bluetech
reviewed
Sep 8, 2024
| cast, | ||
| ) | ||
|
|
||
| try: |
There was a problem hiding this comment.
Minor nit: I know @whot suggested to use try/except for this, though in my experience the sys.version_info-style check is more common in Python, because it can be statically analyzed and can be automatically be removed when dropping support for old versions, while try/except need manual handling.
In this case, another alternative is to unconditionally do this:
from typing import TYPE_CHECKING
if TYPE_CHECKING:
from typing_extensions import Self|
|
||
| DEFAULT_RULES_XML = "@XKB_CONFIG_ROOT@/rules/evdev.xml" | ||
|
|
||
| # Meson needs to fill this in so we can call the tool in the buildir. | ||
| EXTRA_PATH = "@MESON_BUILD_ROOT@" | ||
| os.environ["PATH"] = ":".join([EXTRA_PATH, os.getenv("PATH")]) | ||
|
|
||
| os.environ["PATH"] = ":".join(filter(None, (EXTRA_PATH, os.getenv("PATH")))) |
There was a problem hiding this comment.
I'm using Python for some time and didn't know filter(None, ...) was a thing :)
It might be a bit clearer to do
":".join(path for path in (EXTRA_PATH, os.getenv("PATH")) if path)but the filter is OK too.
| except ImportError: | ||
| pass | ||
| @property | ||
| def __iter__(self) -> Generator[str | None, None, None]: |
There was a problem hiding this comment.
Suggested change
| def __iter__(self) -> Generator[str | None, None, None]: | |
| def __iter__(self) -> Iterator[str | None]: |
(the fact that it's a generator is an implementation detail)
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.