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
91cb298f
Commit
91cb298f
authored
Aug 24, 2018
by
Vladimir Matveev
Committed by
Tal Einat
Aug 24, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bpo-6700: Fix inspect.getsourcelines for module level frames/tracebacks (GH-8864)
parent
075b3c32
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
26 additions
and
3 deletions
+26
-3
Lib/inspect.py
Lib/inspect.py
+6
-1
Lib/test/inspect_fodder.py
Lib/test/inspect_fodder.py
+6
-0
Lib/test/test_inspect.py
Lib/test/test_inspect.py
+12
-2
Misc/NEWS.d/next/Library/2018-08-22-17-43-52.bpo-6700.hp7C4B.rst
...WS.d/next/Library/2018-08-22-17-43-52.bpo-6700.hp7C4B.rst
+2
-0
No files found.
Lib/inspect.py
View file @
91cb298f
...
...
@@ -954,7 +954,12 @@ def getsourcelines(object):
object
=
unwrap
(
object
)
lines
,
lnum
=
findsource
(
object
)
if
ismodule
(
object
):
if
istraceback
(
object
):
object
=
object
.
tb_frame
# for module or frame that corresponds to module, return all source lines
if
(
ismodule
(
object
)
or
(
isframe
(
object
)
and
object
.
f_code
.
co_name
==
"<module>"
)):
return
lines
,
0
else
:
return
getblock
(
lines
[
lnum
:]),
lnum
+
1
...
...
Lib/test/inspect_fodder.py
View file @
91cb298f
...
...
@@ -74,3 +74,9 @@ class FesteringGob(MalodorousPervert, ParrotDroppings):
async
def
lobbest
(
grenade
):
pass
currentframe
=
inspect
.
currentframe
()
try
:
raise
Exception
()
except
:
tb
=
sys
.
exc_info
()[
2
]
Lib/test/test_inspect.py
View file @
91cb298f
...
...
@@ -344,7 +344,7 @@ class GetSourceBase(unittest.TestCase):
def
sourcerange
(
self
,
top
,
bottom
):
lines
=
self
.
source
.
split
(
"
\
n
"
)
return
"
\
n
"
.
join
(
lines
[
top
-
1
:
bottom
])
+
"
\
n
"
return
"
\
n
"
.
join
(
lines
[
top
-
1
:
bottom
])
+
(
"
\
n
"
if
bottom
else
""
)
def
assertSourceEqual
(
self
,
obj
,
top
,
bottom
):
self
.
assertEqual
(
inspect
.
getsource
(
obj
),
...
...
@@ -527,6 +527,16 @@ class TestRetrievingSourceCode(GetSourceBase):
def
test_getsource_on_code_object
(
self
):
self
.
assertSourceEqual
(
mod
.
eggs
.
__code__
,
12
,
18
)
class
TestGettingSourceOfToplevelFrames
(
GetSourceBase
):
fodderModule
=
mod
def
test_range_toplevel_frame
(
self
):
self
.
maxDiff
=
None
self
.
assertSourceEqual
(
mod
.
currentframe
,
1
,
None
)
def
test_range_traceback_toplevel_frame
(
self
):
self
.
assertSourceEqual
(
mod
.
tb
,
1
,
None
)
class
TestDecorators
(
GetSourceBase
):
fodderModule
=
mod2
...
...
@@ -3870,7 +3880,7 @@ def test_main():
TestBoundArguments
,
TestSignaturePrivateHelpers
,
TestSignatureDefinitions
,
TestIsDataDescriptor
,
TestGetClosureVars
,
TestUnwrap
,
TestMain
,
TestReload
,
TestGetCoroutineState
TestGetCoroutineState
,
TestGettingSourceOfToplevelFrames
)
if
__name__
==
"__main__"
:
...
...
Misc/NEWS.d/next/Library/2018-08-22-17-43-52.bpo-6700.hp7C4B.rst
0 → 100644
View file @
91cb298f
Fix inspect.getsourcelines for module level frames/tracebacks.
Patch by Vladimir Matveev.
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