mirror of
https://github.com/python/cpython
synced 2024-09-16 00:27:20 +00:00
gh-112137: change dis output to show no-lineno as -- instead of None (#112335)
This commit is contained in:
parent
9e56eedd01
commit
89ddea4886
|
@ -478,7 +478,8 @@ def _disassemble(self, lineno_width=3, mark_as_current=False, offset_width=0):
|
||||||
if self.starts_line:
|
if self.starts_line:
|
||||||
lineno_fmt = "%%%dd" if self.line_number is not None else "%%%ds"
|
lineno_fmt = "%%%dd" if self.line_number is not None else "%%%ds"
|
||||||
lineno_fmt = lineno_fmt % lineno_width
|
lineno_fmt = lineno_fmt % lineno_width
|
||||||
fields.append(lineno_fmt % self.line_number)
|
lineno = self.line_number if self.line_number is not None else '--'
|
||||||
|
fields.append(lineno_fmt % lineno)
|
||||||
else:
|
else:
|
||||||
fields.append(' ' * lineno_width)
|
fields.append(' ' * lineno_width)
|
||||||
# Column: Label
|
# Column: Label
|
||||||
|
|
|
@ -412,7 +412,7 @@ def wrap_func_w_kwargs():
|
||||||
%4d L2: LOAD_FAST_CHECK 1 (tb)
|
%4d L2: LOAD_FAST_CHECK 1 (tb)
|
||||||
RETURN_VALUE
|
RETURN_VALUE
|
||||||
|
|
||||||
None L3: PUSH_EXC_INFO
|
-- L3: PUSH_EXC_INFO
|
||||||
|
|
||||||
%4d LOAD_GLOBAL 0 (Exception)
|
%4d LOAD_GLOBAL 0 (Exception)
|
||||||
CHECK_EXC_MATCH
|
CHECK_EXC_MATCH
|
||||||
|
@ -430,14 +430,14 @@ def wrap_func_w_kwargs():
|
||||||
%4d LOAD_FAST 1 (tb)
|
%4d LOAD_FAST 1 (tb)
|
||||||
RETURN_VALUE
|
RETURN_VALUE
|
||||||
|
|
||||||
None L6: LOAD_CONST 0 (None)
|
-- L6: LOAD_CONST 0 (None)
|
||||||
STORE_FAST 0 (e)
|
STORE_FAST 0 (e)
|
||||||
DELETE_FAST 0 (e)
|
DELETE_FAST 0 (e)
|
||||||
RERAISE 1
|
RERAISE 1
|
||||||
|
|
||||||
%4d L7: RERAISE 0
|
%4d L7: RERAISE 0
|
||||||
|
|
||||||
None L8: COPY 3
|
-- L8: COPY 3
|
||||||
POP_EXCEPT
|
POP_EXCEPT
|
||||||
RERAISE 1
|
RERAISE 1
|
||||||
ExceptionTable:
|
ExceptionTable:
|
||||||
|
@ -518,7 +518,7 @@ def _with(c):
|
||||||
STORE_FAST 2 (y)
|
STORE_FAST 2 (y)
|
||||||
RETURN_CONST 0 (None)
|
RETURN_CONST 0 (None)
|
||||||
|
|
||||||
None L6: COPY 3
|
-- L6: COPY 3
|
||||||
POP_EXCEPT
|
POP_EXCEPT
|
||||||
RERAISE 1
|
RERAISE 1
|
||||||
ExceptionTable:
|
ExceptionTable:
|
||||||
|
@ -576,11 +576,11 @@ async def _asyncwith(c):
|
||||||
|
|
||||||
%4d L12: CLEANUP_THROW
|
%4d L12: CLEANUP_THROW
|
||||||
|
|
||||||
None L13: JUMP_BACKWARD 26 (to L5)
|
-- L13: JUMP_BACKWARD 26 (to L5)
|
||||||
|
|
||||||
%4d L14: CLEANUP_THROW
|
%4d L14: CLEANUP_THROW
|
||||||
|
|
||||||
None L15: JUMP_BACKWARD 11 (to L11)
|
-- L15: JUMP_BACKWARD 11 (to L11)
|
||||||
|
|
||||||
%4d L16: PUSH_EXC_INFO
|
%4d L16: PUSH_EXC_INFO
|
||||||
WITH_EXCEPT_START
|
WITH_EXCEPT_START
|
||||||
|
@ -604,7 +604,7 @@ async def _asyncwith(c):
|
||||||
STORE_FAST 2 (y)
|
STORE_FAST 2 (y)
|
||||||
RETURN_CONST 0 (None)
|
RETURN_CONST 0 (None)
|
||||||
|
|
||||||
None L24: COPY 3
|
-- L24: COPY 3
|
||||||
POP_EXCEPT
|
POP_EXCEPT
|
||||||
RERAISE 1
|
RERAISE 1
|
||||||
L25: CALL_INTRINSIC_1 3 (INTRINSIC_STOPITERATION_ERROR)
|
L25: CALL_INTRINSIC_1 3 (INTRINSIC_STOPITERATION_ERROR)
|
||||||
|
@ -659,7 +659,7 @@ def _tryfinallyconst(b):
|
||||||
POP_TOP
|
POP_TOP
|
||||||
RETURN_VALUE
|
RETURN_VALUE
|
||||||
|
|
||||||
None L3: PUSH_EXC_INFO
|
-- L3: PUSH_EXC_INFO
|
||||||
|
|
||||||
%4d LOAD_FAST 1 (b)
|
%4d LOAD_FAST 1 (b)
|
||||||
PUSH_NULL
|
PUSH_NULL
|
||||||
|
@ -667,7 +667,7 @@ def _tryfinallyconst(b):
|
||||||
POP_TOP
|
POP_TOP
|
||||||
RERAISE 0
|
RERAISE 0
|
||||||
|
|
||||||
None L4: COPY 3
|
-- L4: COPY 3
|
||||||
POP_EXCEPT
|
POP_EXCEPT
|
||||||
RERAISE 1
|
RERAISE 1
|
||||||
ExceptionTable:
|
ExceptionTable:
|
||||||
|
@ -693,7 +693,7 @@ def _tryfinallyconst(b):
|
||||||
POP_TOP
|
POP_TOP
|
||||||
RETURN_CONST 1 (1)
|
RETURN_CONST 1 (1)
|
||||||
|
|
||||||
None L1: PUSH_EXC_INFO
|
-- L1: PUSH_EXC_INFO
|
||||||
|
|
||||||
%4d LOAD_FAST 0 (b)
|
%4d LOAD_FAST 0 (b)
|
||||||
PUSH_NULL
|
PUSH_NULL
|
||||||
|
@ -701,7 +701,7 @@ def _tryfinallyconst(b):
|
||||||
POP_TOP
|
POP_TOP
|
||||||
RERAISE 0
|
RERAISE 0
|
||||||
|
|
||||||
None L2: COPY 3
|
-- L2: COPY 3
|
||||||
POP_EXCEPT
|
POP_EXCEPT
|
||||||
RERAISE 1
|
RERAISE 1
|
||||||
ExceptionTable:
|
ExceptionTable:
|
||||||
|
@ -730,7 +730,7 @@ def foo(x):
|
||||||
return foo
|
return foo
|
||||||
|
|
||||||
dis_nested_0 = """\
|
dis_nested_0 = """\
|
||||||
None MAKE_CELL 0 (y)
|
-- MAKE_CELL 0 (y)
|
||||||
|
|
||||||
%4d RESUME 0
|
%4d RESUME 0
|
||||||
|
|
||||||
|
@ -752,7 +752,7 @@ def foo(x):
|
||||||
|
|
||||||
dis_nested_1 = """%s
|
dis_nested_1 = """%s
|
||||||
Disassembly of <code object foo at 0x..., file "%s", line %d>:
|
Disassembly of <code object foo at 0x..., file "%s", line %d>:
|
||||||
None COPY_FREE_VARS 1
|
-- COPY_FREE_VARS 1
|
||||||
MAKE_CELL 0 (x)
|
MAKE_CELL 0 (x)
|
||||||
|
|
||||||
%4d RESUME 0
|
%4d RESUME 0
|
||||||
|
@ -779,7 +779,7 @@ def foo(x):
|
||||||
|
|
||||||
dis_nested_2 = """%s
|
dis_nested_2 = """%s
|
||||||
Disassembly of <code object <genexpr> at 0x..., file "%s", line %d>:
|
Disassembly of <code object <genexpr> at 0x..., file "%s", line %d>:
|
||||||
None COPY_FREE_VARS 1
|
-- COPY_FREE_VARS 1
|
||||||
|
|
||||||
%4d RETURN_GENERATOR
|
%4d RETURN_GENERATOR
|
||||||
POP_TOP
|
POP_TOP
|
||||||
|
@ -797,7 +797,7 @@ def foo(x):
|
||||||
L3: END_FOR
|
L3: END_FOR
|
||||||
RETURN_CONST 0 (None)
|
RETURN_CONST 0 (None)
|
||||||
|
|
||||||
None L4: CALL_INTRINSIC_1 3 (INTRINSIC_STOPITERATION_ERROR)
|
-- L4: CALL_INTRINSIC_1 3 (INTRINSIC_STOPITERATION_ERROR)
|
||||||
RERAISE 1
|
RERAISE 1
|
||||||
ExceptionTable:
|
ExceptionTable:
|
||||||
L1 to L4 -> L4 [0] lasti
|
L1 to L4 -> L4 [0] lasti
|
||||||
|
|
|
@ -0,0 +1 @@
|
||||||
|
Change :mod:`dis` output to display no-lineno as "--" instead of "None".
|
Loading…
Reference in a new issue