summaryrefslogtreecommitdiffstats
path: root/Lib/inspect.py
diff options
context:
space:
mode:
authorMiss Islington (bot) <31488909+miss-islington@users.noreply.github.com>2018-03-06 15:16:11 (GMT)
committerJason R. Coombs <jaraco@jaraco.com>2018-03-06 15:16:11 (GMT)
commit5a0c3987abd6a71b4fadeb525477eb5f560e8514 (patch)
treec122b4a136212f234af8add291d455dfc0164c7f /Lib/inspect.py
parent31e2b76f7bbcb8278748565252767a8b7790ff27 (diff)
downloadcpython-5a0c3987abd6a71b4fadeb525477eb5f560e8514.zip
cpython-5a0c3987abd6a71b4fadeb525477eb5f560e8514.tar.gz
cpython-5a0c3987abd6a71b4fadeb525477eb5f560e8514.tar.bz2
bpo-32991: Restore expectation that inspect.getfile raises TypeError on namespace package (GH-5980) (GH-5997)
* bpo-32991: Add test capturing expectation. DocTestFinder.find should return an empty list for doctests in a namespace package. * bpo-32991: Restore expectation that inspect.getfile on a namespace package raises TypeError. (cherry picked from commit b9650a04a81355c8a7dcd0464c28febfb4bfc0a9) Co-authored-by: Jason R. Coombs <jaraco@jaraco.com>
Diffstat (limited to 'Lib/inspect.py')
-rw-r--r--Lib/inspect.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/Lib/inspect.py b/Lib/inspect.py
index bc97efe..d629689 100644
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -642,13 +642,13 @@ def cleandoc(doc):
def getfile(object):
"""Work out which source or compiled file an object was defined in."""
if ismodule(object):
- if hasattr(object, '__file__'):
+ if getattr(object, '__file__', None):
return object.__file__
raise TypeError('{!r} is a built-in module'.format(object))
if isclass(object):
if hasattr(object, '__module__'):
object = sys.modules.get(object.__module__)
- if hasattr(object, '__file__'):
+ if getattr(object, '__file__', None):
return object.__file__
raise TypeError('{!r} is a built-in class'.format(object))
if ismethod(object):