IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4996 from tk0miya/4914_dataclasses

Browse Source 
Fix #4914: autodoc: Parsing error when using dataclasses without default values
This commit is contained in:
Takeshi KOMIYA 2018-05-24 00:28:43 +09:00 committed by GitHub
commit 1b5bc55956
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@ -39,6 +39,7 @@ Bugs fixed
* #4973: latex: glossary directive adds whitespace to each item * #4973: latex: glossary directive adds whitespace to each item
* #4980: latex: Explicit labels on code blocks are duplicated * #4980: latex: Explicit labels on code blocks are duplicated
* #4919: node.asdom() crashes if toctree has :numbered: option * #4919: node.asdom() crashes if toctree has :numbered: option
* #4914: autodoc: Parsing error when using dataclasses without default values
Testing Testing
-------- --------

7
sphinx/pycode/parser.py
View File

@ -224,11 +224,12 @@ class AfterCommentParser(TokenProcessor):
def parse(self): def parse(self):
# type: () -> None # type: () -> None
"""Parse the code and obtain comment after assignment.""" """Parse the code and obtain comment after assignment."""
# skip lvalue (until '=' operator) # skip lvalue (or whole of AnnAssign)
while self.fetch_token() != [OP, '=']: while not self.fetch_token().match([OP, '='], NEWLINE, COMMENT):
assert self.current assert self.current
# skip rvalue # skip rvalue (if exists)
if self.current == [OP, '=']:
self.fetch_rvalue() self.fetch_rvalue()
if self.current == COMMENT: if self.current == COMMENT:

6
tests/test_pycode_parser.py
View File

@ -100,11 +100,13 @@ def test_comment_picker_location():
def test_annotated_assignment_py36(): def test_annotated_assignment_py36():
source = ('a: str = "Sphinx" #: comment\n' source = ('a: str = "Sphinx" #: comment\n'
'b: int = 1\n' 'b: int = 1\n'
'"""string on next line"""') '"""string on next line"""\n'
'c: int #: comment')
parser = Parser(source) parser = Parser(source)
parser.parse() parser.parse()
assert parser.comments == {('', 'a'): 'comment', assert parser.comments == {('', 'a'): 'comment',
('', 'b'): 'string on next line'} ('', 'b'): 'string on next line',
('', 'c'): 'comment'}
assert parser.definitions == {} assert parser.definitions == {}