Rewrite compat patching to fix module double-execution
#490
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
I previously was simply generating aliases for any currently imported klippy modules. While this somewhat worked, it did not handle cases where a module was not imported until after patching completed. This new hooking method provides two features: 1. Rewrite non-package imports, e.g. `import mcu` effectively becomes `import klippy.mcu as mcu` 2. Provide aliases in sys.modules to prevent double-execution of modules. The second is especially important as `is` and `isinstance` checks will fail between two seperately imported copies of the same module.
rogerlz
reviewed
Dec 20, 2024
rogerlz
approved these changes
Dec 23, 2024
kageurufu
added a commit
that referenced
this pull request
Dec 24, 2024
iamnotahippie reported breakage in HappyHare after PR #490 was merged. I did a bunch of investigation, and found that the `path` rewrite in the import aliasing was causing the imported modules to have the wrong internal package name, which caused subsequent relative imports to also look in the wrong place This change fixes that, and with compat in place HappyHare now passes our `--import-test`
rogerlz
pushed a commit
that referenced
this pull request
Dec 27, 2024
iamnotahippie reported breakage in HappyHare after PR #490 was merged. I did a bunch of investigation, and found that the `path` rewrite in the import aliasing was causing the imported modules to have the wrong internal package name, which caused subsequent relative imports to also look in the wrong place This change fixes that, and with compat in place HappyHare now passes our `--import-test`
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.
I previously was simply generating aliases for any currently imported klippy modules. While this somewhat worked, it did not handle cases where a module was not imported until after patching completed.
This new hooking method provides two features:
import mcueffectively becomesimport klippy.mcu as mcuThe second is especially important as
isandisinstancechecks will fail between two seperately imported copies of the same module.Checklist