diff options
author | Brett Cannon <brett@python.org> | 2013-05-04 17:56:58 (GMT) |
---|---|---|
committer | Brett Cannon <brett@python.org> | 2013-05-04 17:56:58 (GMT) |
commit | 4c14b5de1cf372e963a4378fc6cb2bca36d24eb8 (patch) | |
tree | c3d96e142fa3166f582414beeb53fd9792599345 /Lib/inspect.py | |
parent | 4cfc0b5411354323433031b5e03862def2f00234 (diff) | |
download | cpython-4c14b5de1cf372e963a4378fc6cb2bca36d24eb8.zip cpython-4c14b5de1cf372e963a4378fc6cb2bca36d24eb8.tar.gz cpython-4c14b5de1cf372e963a4378fc6cb2bca36d24eb8.tar.bz2 |
#17115,17116: Have modules initialize the __package__ and __loader__
attributes to None.
The long-term goal is for people to be able to rely on these
attributes existing and checking for None to see if they have been
set. Since import itself sets these attributes when a loader does not
the only instances when the attributes are None are from someone
overloading __import__() and not using a loader or someone creating a
module from scratch.
This patch also unifies module initialization. Before you could have
different attributes with default values depending on how the module
object was created. Now the only way to not get the same default set
of attributes is to circumvent initialization by calling
ModuleType.__new__() directly.
Diffstat (limited to 'Lib/inspect.py')
-rw-r--r-- | Lib/inspect.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Lib/inspect.py b/Lib/inspect.py index e60a235..22b9e84 100644 --- a/Lib/inspect.py +++ b/Lib/inspect.py @@ -476,7 +476,7 @@ def getsourcefile(object): if os.path.exists(filename): return filename # only return a non-existent filename if the module has a PEP 302 loader - if hasattr(getmodule(object, filename), '__loader__'): + if getattr(getmodule(object, filename), '__loader__', None) is not None: return filename # or it is in the linecache if filename in linecache.cache: |