-
-
Notifications
You must be signed in to change notification settings - Fork 22
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
Add 3.13 compatibility #129
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
c34347d
Pull dataclasses remove functions into module
benjjs 54d1c6e
explicitly pass no type params to _eval_type() to suppress warning
benjjs 49ddf02
Only add eval type param on 3.13 or greater
benjjs 2971827
Address comments
benjjs 94216c4
Merge branch 'main' into 3.13-compatibility
rnag 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 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 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 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 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 |
---|---|---|
@@ -0,0 +1,59 @@ | ||
""" | ||
Pulling some functions removed in recent versions of Python into the module for continued compatibility. | ||
All function names and bodies are left exactly as they were prior to being removed. | ||
""" | ||
|
||
from dataclasses import MISSING | ||
from types import FunctionType | ||
|
||
|
||
def _set_qualname(cls, value): | ||
# Removed in Python 3.13 | ||
# Original: `dataclasses._set_qualname` | ||
# Ensure that the functions returned from _create_fn uses the proper | ||
# __qualname__ (the class they belong to). | ||
if isinstance(value, FunctionType): | ||
value.__qualname__ = f"{cls.__qualname__}.{value.__name__}" | ||
return value | ||
|
||
|
||
def _set_new_attribute(cls, name, value): | ||
# Removed in Python 3.13 | ||
# Original: `dataclasses._set_new_attribute` | ||
# Never overwrites an existing attribute. Returns True if the | ||
# attribute already exists. | ||
if name in cls.__dict__: | ||
return True | ||
_set_qualname(cls, value) | ||
setattr(cls, name, value) | ||
return False | ||
|
||
|
||
def _create_fn(name, args, body, *, globals=None, locals=None, | ||
return_type=MISSING): | ||
# Removed in Python 3.13 | ||
# Original: `dataclasses._create_fn` | ||
# Note that we may mutate locals. Callers beware! | ||
# The only callers are internal to this module, so no | ||
# worries about external callers. | ||
if locals is None: | ||
locals = {} | ||
return_annotation = '' | ||
if return_type is not MISSING: | ||
locals['__dataclass_return_type__'] = return_type | ||
return_annotation = '->__dataclass_return_type__' | ||
args = ','.join(args) | ||
body = '\n'.join(f' {b}' for b in body) | ||
|
||
# Compute the text of the entire function. | ||
txt = f' def {name}({args}){return_annotation}:\n{body}' | ||
|
||
# Free variables in exec are resolved in the global namespace. | ||
# The global namespace we have is user-provided, so we can't modify it for | ||
# our purposes. So we put the things we need into locals and introduce a | ||
# scope to allow the function we're creating to close over them. | ||
local_vars = ', '.join(locals.keys()) | ||
txt = f"def __create_fn__({local_vars}):\n{txt}\n return {name}" | ||
ns = {} | ||
exec(txt, globals, ns) | ||
return ns['__create_fn__'](**locals) |
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
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.
@benjjs Minor thing, can you pull this out to the top level? That way we won't need to do a python version check each time
eval_forward_ref()
is called. Thanks!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.
Follow-up, we can add this to
utils/typing_compat.py
and import/use it instead:Thanks!
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.
This was not resolved, but its OK, I can do that. Simple fix.