diff options
author | Brett Cannon <brett@python.org> | 2012-04-18 01:41:35 (GMT) |
---|---|---|
committer | Brett Cannon <brett@python.org> | 2012-04-18 01:41:35 (GMT) |
commit | 7bd329d800b29e195a55b16093ef74c22e20476d (patch) | |
tree | 04d1ecb74f0abcb0ee9708f212bf6fd5818ca813 /Lib/importlib/_bootstrap.py | |
parent | 64befe939c1da377053f6a410f082db02184c5e2 (diff) | |
download | cpython-7bd329d800b29e195a55b16093ef74c22e20476d.zip cpython-7bd329d800b29e195a55b16093ef74c22e20476d.tar.gz cpython-7bd329d800b29e195a55b16093ef74c22e20476d.tar.bz2 |
Issue #12599: Be more strict in accepting None vs. a false-like object
in importlib.
Thanks to PJE for pointing out the issue and Nick Coghlan for filing
the bug.
Diffstat (limited to 'Lib/importlib/_bootstrap.py')
-rw-r--r-- | Lib/importlib/_bootstrap.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Lib/importlib/_bootstrap.py b/Lib/importlib/_bootstrap.py index 983abd5..415c488 100644 --- a/Lib/importlib/_bootstrap.py +++ b/Lib/importlib/_bootstrap.py @@ -217,7 +217,7 @@ def module_for_loader(fxn): """ def module_for_loader_wrapper(self, fullname, *args, **kwargs): module = sys.modules.get(fullname) - is_reload = bool(module) + is_reload = module is not None if not is_reload: # This must be done before open() is called as the 'io' module # implicitly imports 'locale' and would otherwise trigger an @@ -711,7 +711,7 @@ class PathFinder: If 'hooks' is false then use sys.path_hooks. """ - if not hooks: + if hooks is None: hooks = sys.path_hooks for hook in hooks: try: @@ -753,7 +753,7 @@ class PathFinder: def find_module(cls, fullname, path=None): """Find the module on sys.path or 'path' based on sys.path_hooks and sys.path_importer_cache.""" - if not path: + if path is None: path = sys.path for entry in path: try: |