NotificationsYou must be signed in to change notification settings
Fork248
Star2.7k

Commitc6e513c

committed

Handle type annotations in function signatures

1 parent9bbb25d commitc6e513cCopy full SHA for c6e513c

File tree

2 files changed

+16

-7

lines changed

bpython
- inspection.py
- test
  - test_inspection.py

2 files changed

+16

-7

lines changed

`‎bpython/inspection.py`

Lines changed: 16 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`importpydoc`
`27`	`27`	`importre`
`28`	`28`	`fromcollectionsimportnamedtuple`
`29`		`-fromtypingimportAny,Optional,Type`
	`29`	`+fromtypingimportAny,Optional,Type,Dict,List`
`30`	`30`	`fromtypesimportMemberDescriptorType,TracebackType`
`31`	`31`	`from ._typing_compatimportLiteral`
`32`	`32`
`@@ -121,15 +121,16 @@ def __repr__(self):`
`121`	`121`	`__str__=__repr__`
`122`	`122`
`123`	`123`
`124`		`-defparsekeywordpairs(signature):`
`125`		`-tokens=Python3Lexer().get_tokens(signature)`
	`124`	`+defparsekeywordpairs(signature:str)->Dict[str,str]:`
`126`	`125`	`preamble=True`
`127`	`126`	`stack= []`
`128`		`-substack= []`
	`127`	`+substack:List[str]= []`
`129`	`128`	`parendepth=0`
`130`		`-fortoken,valueintokens:`
	`129`	`+annotation=False`
	`130`	`+fortoken,valueinPython3Lexer().get_tokens(signature):`
`131`	`131`	`ifpreamble:`
`132`	`132`	`iftokenisToken.Punctuationandvalue=="(":`
	`133`	`+# First "(" starts the list of arguments`
`133`	`134`	`preamble=False`
`134`	`135`	`continue`
`135`	`136`
`@@ -141,14 +142,23 @@ def parsekeywordpairs(signature):`
`141`	`142`	`elifvalue==":"andparendepth==-1:`
`142`	`143`	`# End of signature reached`
`143`	`144`	`break`
	`145`	`+elifvalue==":"andparendepth==0:`
	`146`	`+# Start of type annotation`
	`147`	`+annotation=True`
	`148`	`+`
`144`	`149`	`if (value==","andparendepth==0)or (`
`145`	`150`	`value==")"andparendepth==-1`
`146`	`151`	`):`
`147`	`152`	`stack.append(substack)`
`148`	`153`	`substack= []`
	`154`	`+# If type annotation didn't end before, ti does now.`
	`155`	`+annotation=False`
`149`	`156`	`continue`
	`157`	`+eliftokenisToken.Operatorandvalue=="="andparendepth==0:`
	`158`	`+# End of type annotation`
	`159`	`+annotation=False`
`150`	`160`
`151`		`-ifvalueand (parendepth>0orvalue.strip()):`
	`161`	`+ifvalueandnotannotationand(parendepth>0orvalue.strip()):`
`152`	`162`	`substack.append(value)`
`153`	`163`
`154`	`164`	`return {item[0]:"".join(item[2:])foriteminstackiflen(item)>=3}`

`‎bpython/test/test_inspection.py`

Lines changed: 0 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -147,7 +147,6 @@ def test_getfuncprops_numpy_array(self):`
`147`	`147`	`# np.array(object, dtype=None, *, ...).`
`148`	`148`	`self.assertEqual(props.argspec.args, ["object","dtype"])`
`149`	`149`
`150`		`-@unittest.expectedFailure`
`151`	`150`	`deftest_issue_966_freestanding(self):`
`152`	`151`	`deffun(number,lst=[]):`
`153`	`152`	`"""`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commitc6e513c

File tree

2 files changed

2 files changed

`‎bpython/inspection.py`

`‎bpython/test/test_inspection.py`

0 commit comments