Skip to content
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

gh-107995: Fix doctest collection of functools.cached_property objects #107996

Merged
merged 3 commits into from
Aug 18, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
1 change: 1 addition & 0 deletions Lib/functools.py
Original file line number Diff line number Diff line change
Expand Up @@ -984,6 +984,7 @@ def __init__(self, func):
self.func = func
self.attrname = None
self.__doc__ = func.__doc__
self.__module__ = func.__module__
AlexWaygood marked this conversation as resolved.
Show resolved Hide resolved

def __set_name__(self, owner, name):
if self.attrname is None:
Expand Down
12 changes: 12 additions & 0 deletions Lib/test/test_doctest.py
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,14 @@ def a_classmethod_property(cls):
"""
return cls.a_class_attribute

@functools.cached_property
def a_cached_property(self):
"""
>>> print(SampleClass(29).get())
29
"""
return "hello"

class NestedClass:
"""
>>> x = SampleClass.NestedClass(5)
Expand Down Expand Up @@ -515,6 +523,7 @@ def basics(): r"""
3 SampleClass.NestedClass
1 SampleClass.NestedClass.__init__
1 SampleClass.__init__
1 SampleClass.a_cached_property
2 SampleClass.a_classmethod
1 SampleClass.a_classmethod_property
1 SampleClass.a_property
Expand Down Expand Up @@ -571,6 +580,7 @@ def basics(): r"""
3 some_module.SampleClass.NestedClass
1 some_module.SampleClass.NestedClass.__init__
1 some_module.SampleClass.__init__
1 some_module.SampleClass.a_cached_property
2 some_module.SampleClass.a_classmethod
1 some_module.SampleClass.a_classmethod_property
1 some_module.SampleClass.a_property
Expand Down Expand Up @@ -613,6 +623,7 @@ def basics(): r"""
3 SampleClass.NestedClass
1 SampleClass.NestedClass.__init__
1 SampleClass.__init__
1 SampleClass.a_cached_property
2 SampleClass.a_classmethod
1 SampleClass.a_classmethod_property
1 SampleClass.a_property
Expand All @@ -634,6 +645,7 @@ def basics(): r"""
0 SampleClass.NestedClass.get
0 SampleClass.NestedClass.square
1 SampleClass.__init__
1 SampleClass.a_cached_property
2 SampleClass.a_classmethod
1 SampleClass.a_classmethod_property
1 SampleClass.a_property
Expand Down
3 changes: 3 additions & 0 deletions Lib/test/test_functools.py
Original file line number Diff line number Diff line change
Expand Up @@ -3105,6 +3105,9 @@ def test_access_from_class(self):
def test_doc(self):
self.assertEqual(CachedCostItem.cost.__doc__, "The cost of the item.")

def test_module(self):
self.assertEqual(CachedCostItem.cost.__module__, CachedCostItem.__module__)

def test_subclass_with___set__(self):
"""Caching still works for a subclass defining __set__."""
class readonly_cached_property(py_functools.cached_property):
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
The ``__module__`` attribute on instances of :class:`functools.cached_property`
is now set to the name of the module in which the cached_property is defined,
rather than "functools". This means that doctests in ``cached_property``
docstrings are now properly collected by the :mod:`doctest` module. Patch by
Tyler Smart.
Loading