Skip to content

bpo-29638: Fix spurious refleaks after typing is imported #469

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 3 commits into from
Mar 5, 2017
Merged

bpo-29638: Fix spurious refleaks after typing is imported #469

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
88256b1
Fix spurious refleaks after typing is imported
ilevkivskyi Mar 4, 2017
5473238
Move the workaround to dash_R_cleanup
ilevkivskyi Mar 5, 2017
4d98cab
Remove occasionally forgotten unnecessary code
ilevkivskyi Mar 5, 2017
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: 8 additions & 3 deletions Lib/test/libregrtest/refleak.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,14 @@ def dash_R_cleanup(fs, ps, pic, zdc, abcs):
sys._clear_type_cache()

# Clear ABC registries, restoring previously saved ABC registries.
for abc in [getattr(collections.abc, a) for a in collections.abc.__all__]:
if not isabstract(abc):
continue
abs_classes = [getattr(collections.abc, a) for a in collections.abc.__all__]
abs_classes = filter(isabstract, abs_classes)
if 'typing' in sys.modules:
t = sys.modules['typing']
# These classes require special treatment because they do not appear
# in direct subclasses of collections.abc classes
abs_classes = list(abs_classes) + [t.ChainMap, t.Counter, t.DefaultDict]
for abc in abs_classes:
for obj in abc.__subclasses__() + [abc]:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to proceed subclasses of typing.ChainMap etc?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

They do not have subclasses yet, but if in future they will have some, then yes we will need to process them.
(Now however we need to process subclasses of other classes in abs_classes list)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On a second thought I think it is better to have this, because e.g. Counter[int] is a subclass of Counter, and Counter[int] is created in test_typing.

obj._abc_registry = abcs.get(obj, WeakSet()).copy()
obj._abc_cache.clear()
Expand Down