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
f31cd150
Commit
f31cd150
authored
Sep 15, 2016
by
Yury Selivanov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue #26654: Inspect functools.partial in asyncio.Handle.__repr__.
Patch by iceboy.
parent
d0aef440
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
15 deletions
+26
-15
Lib/asyncio/coroutines.py
Lib/asyncio/coroutines.py
+1
-1
Lib/asyncio/events.py
Lib/asyncio/events.py
+14
-13
Lib/test/test_asyncio/test_events.py
Lib/test/test_asyncio/test_events.py
+8
-1
Misc/NEWS
Misc/NEWS
+3
-0
No files found.
Lib/asyncio/coroutines.py
View file @
f31cd150
...
@@ -271,7 +271,7 @@ def _format_coroutine(coro):
...
@@ -271,7 +271,7 @@ def _format_coroutine(coro):
func
=
coro
func
=
coro
if
coro_name
is
None
:
if
coro_name
is
None
:
coro_name
=
events
.
_format_callback
(
func
,
())
coro_name
=
events
.
_format_callback
(
func
,
()
,
{}
)
try
:
try
:
coro_code
=
coro
.
gi_code
coro_code
=
coro
.
gi_code
...
...
Lib/asyncio/events.py
View file @
f31cd150
...
@@ -35,23 +35,25 @@ def _get_function_source(func):
...
@@ -35,23 +35,25 @@ def _get_function_source(func):
return
None
return
None
def
_format_args
(
args
):
def
_format_args
_and_kwargs
(
args
,
kw
args
):
"""Format function arguments.
"""Format function arguments
and keyword arguments
.
Special case for a single parameter: ('hello',) is formatted as ('hello').
Special case for a single parameter: ('hello',) is formatted as ('hello').
"""
"""
# use reprlib to limit the length of the output
# use reprlib to limit the length of the output
args_repr
=
reprlib
.
repr
(
args
)
items
=
[]
if
len
(
args
)
==
1
and
args_repr
.
endswith
(
',)'
):
if
args
:
args_repr
=
args_repr
[:
-
2
]
+
')'
items
.
extend
(
reprlib
.
repr
(
arg
)
for
arg
in
args
)
return
args_repr
if
kwargs
:
items
.
extend
(
'{}={}'
.
format
(
k
,
reprlib
.
repr
(
v
))
for
k
,
v
in
kwargs
.
items
())
return
'('
+
', '
.
join
(
items
)
+
')'
def
_format_callback
(
func
,
args
,
suffix
=
''
):
def
_format_callback
(
func
,
args
,
kwargs
,
suffix
=
''
):
if
isinstance
(
func
,
functools
.
partial
):
if
isinstance
(
func
,
functools
.
partial
):
if
args
is
not
None
:
suffix
=
_format_args_and_kwargs
(
args
,
kwargs
)
+
suffix
suffix
=
_format_args
(
args
)
+
suffix
return
_format_callback
(
func
.
func
,
func
.
args
,
func
.
keywords
,
suffix
)
return
_format_callback
(
func
.
func
,
func
.
args
,
suffix
)
if
hasattr
(
func
,
'__qualname__'
):
if
hasattr
(
func
,
'__qualname__'
):
func_repr
=
getattr
(
func
,
'__qualname__'
)
func_repr
=
getattr
(
func
,
'__qualname__'
)
...
@@ -60,14 +62,13 @@ def _format_callback(func, args, suffix=''):
...
@@ -60,14 +62,13 @@ def _format_callback(func, args, suffix=''):
else
:
else
:
func_repr
=
repr
(
func
)
func_repr
=
repr
(
func
)
if
args
is
not
None
:
func_repr
+=
_format_args_and_kwargs
(
args
,
kwargs
)
func_repr
+=
_format_args
(
args
)
if
suffix
:
if
suffix
:
func_repr
+=
suffix
func_repr
+=
suffix
return
func_repr
return
func_repr
def
_format_callback_source
(
func
,
args
):
def
_format_callback_source
(
func
,
args
):
func_repr
=
_format_callback
(
func
,
args
)
func_repr
=
_format_callback
(
func
,
args
,
None
)
source
=
_get_function_source
(
func
)
source
=
_get_function_source
(
func
)
if
source
:
if
source
:
func_repr
+=
' at %s:%s'
%
source
func_repr
+=
' at %s:%s'
%
source
...
...
Lib/test/test_asyncio/test_events.py
View file @
f31cd150
...
@@ -2224,7 +2224,7 @@ else:
...
@@ -2224,7 +2224,7 @@ else:
return
asyncio
.
SelectorEventLoop
(
selectors
.
SelectSelector
())
return
asyncio
.
SelectorEventLoop
(
selectors
.
SelectSelector
())
def
noop
(
*
args
):
def
noop
(
*
args
,
**
kwargs
):
pass
pass
...
@@ -2305,6 +2305,13 @@ class HandleTests(test_utils.TestCase):
...
@@ -2305,6 +2305,13 @@ class HandleTests(test_utils.TestCase):
%
(
re
.
escape
(
filename
),
lineno
))
%
(
re
.
escape
(
filename
),
lineno
))
self
.
assertRegex
(
repr
(
h
),
regex
)
self
.
assertRegex
(
repr
(
h
),
regex
)
# partial function with keyword args
cb
=
functools
.
partial
(
noop
,
x
=
1
)
h
=
asyncio
.
Handle
(
cb
,
(
2
,
3
),
self
.
loop
)
regex
=
(
r'^<Handle noop\
(x=
1\
)
\(2, 3\
)
at %s:%s>$'
%
(
re
.
escape
(
filename
),
lineno
))
self
.
assertRegex
(
repr
(
h
),
regex
)
# partial method
# partial method
if
sys
.
version_info
>=
(
3
,
4
):
if
sys
.
version_info
>=
(
3
,
4
):
method
=
HandleTests
.
test_handle_repr
method
=
HandleTests
.
test_handle_repr
...
...
Misc/NEWS
View file @
f31cd150
...
@@ -269,6 +269,9 @@ Library
...
@@ -269,6 +269,9 @@ Library
- Issue #28174: Handle when SO_REUSEPORT isn'
t
properly
supported
.
- Issue #28174: Handle when SO_REUSEPORT isn'
t
properly
supported
.
Patch
by
Seth
Michael
Larson
.
Patch
by
Seth
Michael
Larson
.
-
Issue
#
26654
:
Inspect
functools
.
partial
in
asyncio
.
Handle
.
__repr__
.
Patch
by
iceboy
.
IDLE
IDLE
----
----
...
...
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