Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
C
cpython
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
cpython
Commits
fcef60f5
Commit
fcef60f5
authored
Apr 02, 2019
by
Jeroen Demeyer
Committed by
Petr Viktorin
Apr 02, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bpo-33261: guard access to __code__ attribute in inspect (GH-6448)
parent
487b73ab
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
29 additions
and
9 deletions
+29
-9
Lib/inspect.py
Lib/inspect.py
+14
-9
Lib/test/inspect_fodder.py
Lib/test/inspect_fodder.py
+11
-0
Lib/test/test_inspect.py
Lib/test/test_inspect.py
+1
-0
Misc/NEWS.d/next/Library/2018-04-11-11-41-52.bpo-33291.-xLGf8.rst
...S.d/next/Library/2018-04-11-11-41-52.bpo-33291.-xLGf8.rst
+3
-0
No files found.
Lib/inspect.py
View file @
fcef60f5
...
...
@@ -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."""
...
...
Lib/test/inspect_fodder.py
View file @
fcef60f5
...
...
@@ -80,3 +80,14 @@ try:
raise
Exception
()
except
:
tb
=
sys
.
exc_info
()[
2
]
class
Callable
:
def
__call__
(
self
,
*
args
):
return
args
def
as_method_of
(
self
,
obj
):
from
types
import
MethodType
return
MethodType
(
self
,
obj
)
custom_method
=
Callable
().
as_method_of
(
42
)
del
Callable
Lib/test/test_inspect.py
View file @
fcef60f5
...
...
@@ -146,6 +146,7 @@ class TestPredicates(IsTestBase):
self
.
istest
(
inspect
.
isfunction
,
'mod.spam'
)
self
.
istest
(
inspect
.
isfunction
,
'mod.StupidGit.abuse'
)
self
.
istest
(
inspect
.
ismethod
,
'git.argue'
)
self
.
istest
(
inspect
.
ismethod
,
'mod.custom_method'
)
self
.
istest
(
inspect
.
ismodule
,
'mod'
)
self
.
istest
(
inspect
.
isdatadescriptor
,
'collections.defaultdict.default_factory'
)
self
.
istest
(
inspect
.
isgenerator
,
'(x for x in range(2))'
)
...
...
Misc/NEWS.d/next/Library/2018-04-11-11-41-52.bpo-33291.-xLGf8.rst
0 → 100644
View file @
fcef60f5
Do not raise AttributeError when calling the inspect functions
isgeneratorfunction, iscoroutinefunction, isasyncgenfunction on a method
created from an arbitrary callable. Instead, return False.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment