Skip to content

bpo-41747: Ensure all dataclass methods uses their parents' qualname #22155

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.

Sign up for GitHub

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

Merged
merged 5 commits into from
Oct 21, 2020
Merged

bpo-41747: Ensure all dataclass methods uses their parents' qualname #22155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e6370fb
bpo-41747: Ensure all dataclass methods uses their parents' qualname
isidentical Sep 8, 2020
109c8f0
Apply suggestion by @pablogsal
isidentical Sep 8, 2020
53bb738
Extract functionality to _set_qualname, add tests for all auto-genera…
isidentical Sep 9, 2020
e222153
escape dot
isidentical Sep 9, 2020
6f22168
Address suggestions
isidentical Sep 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions Lib/dataclasses.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
import builtins
import functools
import _thread
from types import GenericAlias
from types import FunctionType, GenericAlias


__all__ = ['dataclass',
Expand Down Expand Up @@ -749,12 +749,19 @@ def _get_field(cls, a_name, a_type):

return f

def _set_qualname(cls, value):
# 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):
# 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

Expand All @@ -769,7 +776,7 @@ def _hash_set_none(cls, fields, globals):

def _hash_add(cls, fields, globals):
flds = [f for f in fields if (f.compare if f.hash is None else f.hash)]
return _hash_fn(flds, globals)
return _set_qualname(cls, _hash_fn(flds, globals))

def _hash_exception(cls, fields, globals):
# Raise an exception.
Expand Down
24 changes: 24 additions & 0 deletions Lib/test/test_dataclasses.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1934,6 +1934,30 @@ class R:
self.assertEqual(new_sample.x, another_new_sample.x)
self.assertEqual(sample.y, another_new_sample.y)

def test_dataclasses_qualnames(self):
@dataclass(order=True, unsafe_hash=True, frozen=True)
class A:
x: int
y: int

self.assertEqual(A.__init__.__name__, "__init__")
for function in (
'__eq__',
'__lt__',
'__le__',
'__gt__',
'__ge__',
'__hash__',
'__init__',
'__repr__',
'__setattr__',
'__delattr__',
):
self.assertEqual(getattr(A, function).__qualname__, f"TestCase.test_dataclasses_qualnames.<locals>.A.{function}")

with self.assertRaisesRegex(TypeError, r"A\.__init__\(\) missing"):
A()


class TestFieldNoAnnotation(unittest.TestCase):
def test_field_without_annotation(self):
Expand Down
3 changes: 3 additions & 0 deletions Misc/NEWS.d/next/Library/2020-09-08-23-41-29.bpo-41747.M6wLKv.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Ensure all methods that generated from :func:`dataclasses.dataclass`
objects now have the proper ``__qualname__`` attribute referring to
the class they belong to. Patch by Batuhan Taskaya.