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
989b9e0e
Commit
989b9e0e
authored
May 28, 2018
by
Yury Selivanov
Committed by
GitHub
May 28, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bpo-33672: Fix Task.__repr__ crash with Cython's bogus coroutines (GH-7161)
parent
8267ea2e
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
61 additions
and
40 deletions
+61
-40
Lib/asyncio/coroutines.py
Lib/asyncio/coroutines.py
+45
-36
Lib/asyncio/format_helpers.py
Lib/asyncio/format_helpers.py
+5
-4
Lib/test/test_asyncio/test_events.py
Lib/test/test_asyncio/test_events.py
+10
-0
Misc/NEWS.d/next/Library/2018-05-28-12-29-54.bpo-33672.GM_Xm_.rst
...S.d/next/Library/2018-05-28-12-29-54.bpo-33672.GM_Xm_.rst
+1
-0
No files found.
Lib/asyncio/coroutines.py
View file @
989b9e0e
...
@@ -189,56 +189,63 @@ def iscoroutine(obj):
...
@@ -189,56 +189,63 @@ def iscoroutine(obj):
def
_format_coroutine
(
coro
):
def
_format_coroutine
(
coro
):
assert
iscoroutine
(
coro
)
assert
iscoroutine
(
coro
)
if
not
hasattr
(
coro
,
'cr_code'
)
and
not
hasattr
(
coro
,
'gi_code'
):
is_corowrapper
=
isinstance
(
coro
,
CoroWrapper
)
# Most likely a built-in type or a Cython coroutine.
def
get_name
(
coro
):
# Built-in types might not have __qualname__ or __name__.
# Coroutines compiled with Cython sometimes don't have
coro_name
=
getattr
(
# proper __qualname__ or __name__. While that is a bug
coro
,
'__qualname__'
,
# in Cython, asyncio shouldn't crash with an AttributeError
getattr
(
coro
,
'__name__'
,
type
(
coro
).
__name__
))
# in its __repr__ functions.
coro_name
=
f'
{
coro_name
}
()'
if
is_corowrapper
:
return
format_helpers
.
_format_callback
(
coro
.
func
,
(),
{})
if
hasattr
(
coro
,
'__qualname__'
)
and
coro
.
__qualname__
:
coro_name
=
coro
.
__qualname__
elif
hasattr
(
coro
,
'__name__'
)
and
coro
.
__name__
:
coro_name
=
coro
.
__name__
else
:
# Stop masking Cython bugs, expose them in a friendly way.
coro_name
=
f'<
{
type
(
coro
).
__name__
}
without __name__>'
return
f'
{
coro_name
}
()'
running
=
False
def
is_running
(
coro
):
try
:
try
:
r
unning
=
coro
.
cr_running
r
eturn
coro
.
cr_running
except
AttributeError
:
except
AttributeError
:
try
:
try
:
r
unning
=
coro
.
gi_running
r
eturn
coro
.
gi_running
except
AttributeError
:
except
AttributeError
:
pass
return
False
if
running
:
coro_code
=
None
if
hasattr
(
coro
,
'cr_code'
)
and
coro
.
cr_code
:
coro_code
=
coro
.
cr_code
elif
hasattr
(
coro
,
'gi_code'
)
and
coro
.
gi_code
:
coro_code
=
coro
.
gi_code
coro_name
=
get_name
(
coro
)
if
not
coro_code
:
# Built-in types might not have __qualname__ or __name__.
if
is_running
(
coro
):
return
f'
{
coro_name
}
running'
return
f'
{
coro_name
}
running'
else
:
else
:
return
coro_name
return
coro_name
coro_name
=
None
coro_frame
=
None
if
isinstance
(
coro
,
CoroWrapper
):
if
hasattr
(
coro
,
'gi_frame'
)
and
coro
.
gi_frame
:
func
=
coro
.
func
coro_name
=
coro
.
__qualname__
if
coro_name
is
not
None
:
coro_name
=
f'
{
coro_name
}
()'
else
:
func
=
coro
if
coro_name
is
None
:
coro_name
=
format_helpers
.
_format_callback
(
func
,
(),
{})
try
:
coro_code
=
coro
.
gi_code
except
AttributeError
:
coro_code
=
coro
.
cr_code
try
:
coro_frame
=
coro
.
gi_frame
coro_frame
=
coro
.
gi_frame
e
xcept
AttributeError
:
e
lif
hasattr
(
coro
,
'cr_frame'
)
and
coro
.
cr_frame
:
coro_frame
=
coro
.
cr_frame
coro_frame
=
coro
.
cr_frame
filename
=
coro_code
.
co_filename
# If Cython's coroutine has a fake code object without proper
# co_filename -- expose that.
filename
=
coro_code
.
co_filename
or
'<empty co_filename>'
lineno
=
0
lineno
=
0
if
(
is
instance
(
coro
,
CoroWrapper
)
and
if
(
is
_corowrapper
and
not
inspect
.
isgeneratorfunction
(
coro
.
func
)
and
coro
.
func
is
not
None
and
coro
.
func
is
not
None
):
not
inspect
.
isgeneratorfunction
(
coro
.
func
)
):
source
=
format_helpers
.
_get_function_source
(
coro
.
func
)
source
=
format_helpers
.
_get_function_source
(
coro
.
func
)
if
source
is
not
None
:
if
source
is
not
None
:
filename
,
lineno
=
source
filename
,
lineno
=
source
...
@@ -246,9 +253,11 @@ def _format_coroutine(coro):
...
@@ -246,9 +253,11 @@ def _format_coroutine(coro):
coro_repr
=
f'
{
coro_name
}
done, defined at
{
filename
}
:
{
lineno
}
'
coro_repr
=
f'
{
coro_name
}
done, defined at
{
filename
}
:
{
lineno
}
'
else
:
else
:
coro_repr
=
f'
{
coro_name
}
running, defined at
{
filename
}
:
{
lineno
}
'
coro_repr
=
f'
{
coro_name
}
running, defined at
{
filename
}
:
{
lineno
}
'
elif
coro_frame
is
not
None
:
elif
coro_frame
is
not
None
:
lineno
=
coro_frame
.
f_lineno
lineno
=
coro_frame
.
f_lineno
coro_repr
=
f'
{
coro_name
}
running at
{
filename
}
:
{
lineno
}
'
coro_repr
=
f'
{
coro_name
}
running at
{
filename
}
:
{
lineno
}
'
else
:
else
:
lineno
=
coro_code
.
co_firstlineno
lineno
=
coro_code
.
co_firstlineno
coro_repr
=
f'
{
coro_name
}
done, defined at
{
filename
}
:
{
lineno
}
'
coro_repr
=
f'
{
coro_name
}
done, defined at
{
filename
}
:
{
lineno
}
'
...
...
Lib/asyncio/format_helpers.py
View file @
989b9e0e
import
functools
import
functools
import
inspect
import
inspect
import
reprlib
import
reprlib
import
sys
import
traceback
import
traceback
from
.
import
constants
from
.
import
constants
...
@@ -45,10 +46,10 @@ def _format_callback(func, args, kwargs, suffix=''):
...
@@ -45,10 +46,10 @@ def _format_callback(func, args, kwargs, suffix=''):
suffix
=
_format_args_and_kwargs
(
args
,
kwargs
)
+
suffix
suffix
=
_format_args_and_kwargs
(
args
,
kwargs
)
+
suffix
return
_format_callback
(
func
.
func
,
func
.
args
,
func
.
keywords
,
suffix
)
return
_format_callback
(
func
.
func
,
func
.
args
,
func
.
keywords
,
suffix
)
if
hasattr
(
func
,
'__qualname__'
):
if
hasattr
(
func
,
'__qualname__'
)
and
func
.
__qualname__
:
func_repr
=
getattr
(
func
,
'__qualname__'
)
func_repr
=
func
.
__qualname__
elif
hasattr
(
func
,
'__name__'
):
elif
hasattr
(
func
,
'__name__'
)
and
func
.
__name__
:
func_repr
=
getattr
(
func
,
'__name__'
)
func_repr
=
func
.
__name__
else
:
else
:
func_repr
=
repr
(
func
)
func_repr
=
repr
(
func
)
...
...
Lib/test/test_asyncio/test_events.py
View file @
989b9e0e
...
@@ -2784,11 +2784,21 @@ class HandleTests(test_utils.TestCase):
...
@@ -2784,11 +2784,21 @@ class HandleTests(test_utils.TestCase):
coro
.
cr_running
=
True
coro
.
cr_running
=
True
self
.
assertEqual
(
coroutines
.
_format_coroutine
(
coro
),
'BBB() running'
)
self
.
assertEqual
(
coroutines
.
_format_coroutine
(
coro
),
'BBB() running'
)
coro
.
__name__
=
coro
.
__qualname__
=
None
self
.
assertEqual
(
coroutines
.
_format_coroutine
(
coro
),
'<CoroLike without __name__>() running'
)
coro
=
CoroLike
()
coro
=
CoroLike
()
coro
.
__qualname__
=
'CoroLike'
# Some coroutines might not have '__name__', such as
# Some coroutines might not have '__name__', such as
# built-in async_gen.asend().
# built-in async_gen.asend().
self
.
assertEqual
(
coroutines
.
_format_coroutine
(
coro
),
'CoroLike()'
)
self
.
assertEqual
(
coroutines
.
_format_coroutine
(
coro
),
'CoroLike()'
)
coro
=
CoroLike
()
coro
.
__qualname__
=
'AAA'
coro
.
cr_code
=
None
self
.
assertEqual
(
coroutines
.
_format_coroutine
(
coro
),
'AAA()'
)
class
TimerTests
(
unittest
.
TestCase
):
class
TimerTests
(
unittest
.
TestCase
):
...
...
Misc/NEWS.d/next/Library/2018-05-28-12-29-54.bpo-33672.GM_Xm_.rst
0 → 100644
View file @
989b9e0e
Fix Task.__repr__ crash with Cython's bogus coroutines
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