Fix __dict__ getset type by youknowone · Pull Request #6010 · RustPython/RustPython
Walkthrough
The change refactors the process of adding the __dict__ descriptor during Python type object creation. Instead of inserting the descriptor before the type is created, it now adds it directly to the type's attributes after initialization, using a different method and maintaining the same condition for insertion. Additionally, the logic for locating the base type with a dictionary and retrieving the __dict__ descriptor is restructured with new helper functions, improving alignment with CPython's approach.
Changes
| File(s) | Change Summary |
|---|---|
| vm/src/builtins/type.rs | Moved __dict__ descriptor insertion to after type object creation with unsafe attribute insertion; replaced find_base_dict_descr with get_builtin_base_with_dict and get_dict_descriptor; rewrote subtype_get_dict and subtype_set_dict to use new helper functions and updated error handling. |
Sequence Diagram(s)
sequenceDiagram
participant Caller
participant PyTypeConstructor
participant TypeObject
participant BaseTypeWithDict
participant DictDescriptor
Caller->>PyTypeConstructor: Create new type
PyTypeConstructor->>TypeObject: Initialize type object
alt If base is not type
PyTypeConstructor->>TypeObject: Insert __dict__ descriptor (post-creation)
end
Caller->>TypeObject: Access __dict__
TypeObject->>BaseTypeWithDict: Find builtin base with dict
BaseTypeWithDict->>DictDescriptor: Lookup __dict__ descriptor
DictDescriptor->>TypeObject: Get or set __dict__ value
Estimated code review effort
2 (60 minutes)
Possibly related PRs
- type.__dict__ #5957: Adds tests and minor constructor logic changes related to
__dict__presence intypeand subclasses, closely related to managing the__dict__descriptor inPyType.
Poem
In the warren of code, a change takes flight,
The__dict__now lands after type’s first light.
No more before—now after, it’s true,
With careful precision, the rabbits renew.
Hopping through Rust, descriptors in tow,
The type’s little secrets continue to grow! 🐇
📜 Recent review details
Configuration used: .coderabbit.yml
Review profile: CHILL
Plan: Pro
📒 Files selected for processing (1)
vm/src/builtins/type.rs(5 hunks)
🚧 Files skipped from review as they are similar to previous changes (1)
- vm/src/builtins/type.rs
⏰ Context from checks skipped due to timeout of 90000ms. You can increase the timeout in your CodeRabbit configuration to a maximum of 15 minutes (900000ms). (10)
- GitHub Check: Run snippets and cpython tests on wasm-wasi
- GitHub Check: Check the WASM package and demo
- GitHub Check: Run rust tests (windows-latest)
- GitHub Check: Run rust tests (macos-latest)
- GitHub Check: Run rust tests (ubuntu-latest)
- GitHub Check: Ensure compilation on various targets
- GitHub Check: Run snippets and cpython tests (macos-latest)
- GitHub Check: Run snippets and cpython tests (ubuntu-latest)
- GitHub Check: Run snippets and cpython tests (windows-latest)
- GitHub Check: Check Rust code with rustfmt and clippy
✨ Finishing Touches
- 📝 Generate Docstrings
Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.
🪧 Tips
Chat
There are 3 ways to chat with CodeRabbit:
- Review comments: Directly reply to a review comment made by CodeRabbit. Example:
I pushed a fix in commit <commit_id>, please review it.Explain this complex logic.Open a follow-up GitHub issue for this discussion.
- Files and specific lines of code (under the "Files changed" tab): Tag
@coderabbitaiin a new review comment at the desired location with your query. Examples:@coderabbitai explain this code block.@coderabbitai modularize this function.
- PR comments: Tag
@coderabbitaiin a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:@coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.@coderabbitai read src/utils.ts and explain its main purpose.@coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.@coderabbitai help me debug CodeRabbit configuration file.
Support
Need help? Create a ticket on our support page for assistance with any issues or questions.
Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.
CodeRabbit Commands (Invoked using PR comments)
@coderabbitai pauseto pause the reviews on a PR.@coderabbitai resumeto resume the paused reviews.@coderabbitai reviewto trigger an incremental review. This is useful when automatic reviews are disabled for the repository.@coderabbitai full reviewto do a full review from scratch and review all the files again.@coderabbitai summaryto regenerate the summary of the PR.@coderabbitai generate docstringsto generate docstrings for this PR.@coderabbitai generate sequence diagramto generate a sequence diagram of the changes in this PR.@coderabbitai resolveresolve all the CodeRabbit review comments.@coderabbitai configurationto show the current CodeRabbit configuration for the repository.@coderabbitai helpto get help.
Other keywords and placeholders
- Add
@coderabbitai ignoreanywhere in the PR description to prevent this PR from being reviewed. - Add
@coderabbitai summaryto generate the high-level summary at a specific location in the PR description. - Add
@coderabbitaianywhere in the PR title to generate the title automatically.
Documentation and Community
- Visit our Documentation for detailed information on how to use CodeRabbit.
- Join our Discord Community to get help, request features, and share feedback.
- Follow us on X/Twitter for updates and announcements.