summaryrefslogtreecommitdiff
path: root/Lib/inspect.py
diff options
context:
space:
mode:
authorJeroen Demeyer <J.Demeyer@UGent.be>2019-04-02 16:03:42 +0200
committerPetr Viktorin <encukou@gmail.com>2019-04-02 16:03:42 +0200
commitfcef60f59d04c63b3540b4c4886226098c1bacd1 (patch)
tree67f920ddc3764d2b2b99f869bc8aab513cf38859 /Lib/inspect.py
parent487b73ab39c80157474821ef9083f51e0846bd62 (diff)
downloadcpython-git-fcef60f59d04c63b3540b4c4886226098c1bacd1.tar.gz
bpo-33261: guard access to __code__ attribute in inspect (GH-6448)
Diffstat (limited to 'Lib/inspect.py')
-rw-r--r--Lib/inspect.py23
1 files changed, 14 insertions, 9 deletions
diff --git a/Lib/inspect.py b/Lib/inspect.py
index 8c398bd353..d8475c63f9 100644
--- a/Lib/inspect.py
+++ b/Lib/inspect.py
@@ -168,23 +168,30 @@ def isfunction(object):
__kwdefaults__ dict of keyword only parameters with defaults"""
return isinstance(object, types.FunctionType)
+def _has_code_flag(f, flag):
+ """Return true if ``f`` is a function (or a method or functools.partial
+ wrapper wrapping a function) whose code object has the given ``flag``
+ set in its flags."""
+ while ismethod(f):
+ f = f.__func__
+ f = functools._unwrap_partial(f)
+ if not isfunction(f):
+ return False
+ return bool(f.__code__.co_flags & flag)
+
def isgeneratorfunction(obj):
"""Return true if the object is a user-defined generator function.
Generator function objects provide the same attributes as functions.
See help(isfunction) for a list of attributes."""
- obj = functools._unwrap_partial(obj)
- return bool((isfunction(obj) or ismethod(obj)) and
- obj.__code__.co_flags & CO_GENERATOR)
+ return _has_code_flag(obj, CO_GENERATOR)
def iscoroutinefunction(obj):
"""Return true if the object is a coroutine function.
Coroutine functions are defined with "async def" syntax.
"""
- obj = functools._unwrap_partial(obj)
- return bool(((isfunction(obj) or ismethod(obj)) and
- obj.__code__.co_flags & CO_COROUTINE))
+ return _has_code_flag(obj, CO_COROUTINE)
def isasyncgenfunction(obj):
"""Return true if the object is an asynchronous generator function.
@@ -192,9 +199,7 @@ def isasyncgenfunction(obj):
Asynchronous generator functions are defined with "async def"
syntax and have "yield" expressions in their body.
"""
- obj = functools._unwrap_partial(obj)
- return bool((isfunction(obj) or ismethod(obj)) and
- obj.__code__.co_flags & CO_ASYNC_GENERATOR)
+ return _has_code_flag(obj, CO_ASYNC_GENERATOR)
def isasyncgen(object):
"""Return true if the object is an asynchronous generator."""