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.

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

FIX check the type of the entries in sys.modules #326

Merged
merged 14 commits into from
Jan 28, 2020
Merged

FIX check the type of the entries in sys.modules #326

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4093b02
FIX check the type of the entries in sys.modules
pierreglaser Jan 20, 2020
35278d7
Merge branch 'master' into fix-faulty-module-interaction-pypy
pierreglaser Jan 24, 2020
8348cff
add a test of a faulty module tricking whichmodule
pierreglaser Jan 26, 2020
f746c5d
also test faulty modules that are module instances
pierreglaser Jan 26, 2020
5da8b99
missing import statement
pierreglaser Jan 26, 2020
773f0d1
FIX hide func's __module__
pierreglaser Jan 26, 2020
4e82270
Update tests/cloudpickle_test.py
pierreglaser Jan 27, 2020
2ddf962
Update tests/cloudpickle_test.py
pierreglaser Jan 27, 2020
f416909
add more inline comments describing the issue
pierreglaser Jan 27, 2020
bbbdfab
MNT update changelog
pierreglaser Jan 27, 2020
090a3b3
DOC more test comments
pierreglaser Jan 27, 2020
f1c0ac8
Merge branch 'master' into fix-faulty-module-interaction-pypy
pierreglaser Jan 27, 2020
2d5e601
CLN typos
pierreglaser Jan 28, 2020
12677e6
Merge branch 'fix-faulty-module-interaction-pypy' of https://github.c…
pierreglaser Jan 28, 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
8 changes: 7 additions & 1 deletion cloudpickle/cloudpickle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,13 @@ def _whichmodule(obj, name):
# Protect the iteration by using a list copy of sys.modules against dynamic
# modules that trigger imports of other modules upon calls to getattr.
for module_name, module in list(sys.modules.items()):
if module_name == '__main__' or module is None:
# Some modules such as coverage can inject non-module objects inside
# sys.modules
if (
module_name == '__main__' or
module is None or
not isinstance(module, types.ModuleType)
pierreglaser marked this conversation as resolved.
Show resolved Hide resolved
):
continue
try:
if _getattribute(module, name)[0] is obj:
Expand Down