fix parsing tuple syntax dunder all (#355)

* fix parse dunder all

* update release notes

* use better function name

* keep line length within 80

* update changelog

Author: Hanaasagi

docs/release_notes.rst

@@ -11,6 +11,7 @@ Major Updates
 
 * Support for Python 2.x and PyPy has been dropped (#340).
 * Added pre-commit hook (#346)
+* Fix parsing tuple syntax ``__all__`` (#355, #352).
 
 3.0.0 - October 14th, 2018
 --------------------------

src/pydocstyle/parser.py

@@ -444,26 +444,35 @@ def parse_dunder_all(self):
             self.dunder_all_error = 'Could not evaluate contents of __all__. '
             return
         self.consume(tk.OP)
-        if self.current.value not in '([':
-            self.dunder_all_error = 'Could not evaluate contents of __all__. '
-            return
-        self.consume(tk.OP)
+
+        is_surrounded = False
+        if self.current.value in '([':
+            is_surrounded = True
+            self.consume(tk.OP)
 
         dunder_all_content = "("
-        while self.current.kind != tk.OP or self.current.value not in ")]":
+        while True:
+            if is_surrounded and self.current.value in ")]":
+                break
+            if self.current.kind in (tk.NEWLINE, tk.ENDMARKER):
+                break
             if self.current.kind in (tk.NL, tk.COMMENT):
                 pass
-            elif (self.current.kind == tk.STRING or
-                    self.current.value == ','):
+            elif (self.current.kind == tk.STRING or self.current.value == ','):
                 dunder_all_content += self.current.value
             else:
-                self.dunder_all_error = (
-                    'Unexpected token kind in __all__: {!r}. '
-                        .format(self.current.kind))
+                self.dunder_all_error = 'Could not evaluate contents of __all__.'
                 return
             self.stream.move()
-        self.consume(tk.OP)
+        if is_surrounded:
+            self.consume(tk.OP)
+        if not is_surrounded and ',' not in dunder_all_content:
+            self.dunder_all_error = (
+                'Unexpected token kind in __all__: {!r}. '
+                    .format(self.current.kind))
+            return
         dunder_all_content += ")"
+
         try:
             self.dunder_all = eval(dunder_all_content, {})
         except BaseException as e:
@@ -472,7 +481,8 @@ def parse_dunder_all(self):
                 '\bThe value was {}. The exception was:\n{}'
                     .format(dunder_all_content, e))
 
-        while not self.current.kind in self.stream.LOGICAL_NEWLINES:
+        while (self.current.kind not in self.stream.LOGICAL_NEWLINES and
+               self.current.kind != tk.ENDMARKER):
             if self.current.kind != tk.COMMENT:
                 self.dunder_all = None
                 self.dunder_all_error = 'Could not evaluate contents of __all__. '

src/tests/parser_test.py

@@ -530,6 +530,27 @@ def nested_3(self):
                    'bar'
         ]
     """),
+    CodeSnippet("""\
+        __all__ = 'foo', 'bar'
+    """),
+    CodeSnippet("""\
+        __all__ = 'foo', 'bar',
+    """),
+    CodeSnippet(
+        """__all__ = 'foo', 'bar'"""
+    ),
+    CodeSnippet("""\
+        __all__ = 'foo', \
+                  'bar'
+    """),
+    CodeSnippet("""\
+        foo = 1
+        __all__ = 'foo', 'bar'
+    """),
+    CodeSnippet("""\
+        __all__ = 'foo', 'bar'
+        foo = 1
+    """),
 ))
 def test_dunder_all(code):
     """Test that __all__ is parsed correctly."""
@@ -538,6 +559,29 @@ def test_dunder_all(code):
     assert module.dunder_all == ('foo', 'bar')
 
 
+def test_single_value_dunder_all():
+    """Test that single value __all__ is parsed correctly."""
+    parser = Parser()
+    code = CodeSnippet("""\
+        __all__ = 'foo',
+    """)
+    module = parser.parse(code, "filepath")
+    assert module.dunder_all == ('foo', )
+
+    code = CodeSnippet("""\
+        __all__ = 'foo'
+    """)
+    module = parser.parse(code, "filepath")
+    assert module.dunder_all is None
+    assert module.dunder_all_error
+
+    code = CodeSnippet("""\
+        __all__ = ('foo', )
+    """)
+    module = parser.parse(code, "filepath")
+    assert module.dunder_all == ('foo', )
+
+
 indeterminable_dunder_all_test_cases = [
     CodeSnippet("""\
         __all__ = ['foo']