Merge pull request #67 from jkrukoff/master

Allow for greater flexibility in parsing __all__.

Author: Vladimir Keleshev

pep257.py

@@ -235,6 +235,8 @@ def parse_all(self):
             sys.stderr.write(msg)
         self.consume(tk.OP)
         s = '('
+        while self.current.kind in (tk.NL, tk.COMMENT):
+            self.stream.move()
         if self.current.kind != tk.STRING:
             raise AllError('Could not evaluate contents of __all__. ')
         while self.current.value not in ')]':

test_definitions.py

@@ -29,6 +29,12 @@ def nested_3(self):
 __all__ = ['a', 'b'
            'c',]
 '''
+source_alt_nl_at_bracket = '''
+__all__ = [
+
+    # Inconvenient comment.
+    'a', 'b' 'c',]
+'''
 
 
 def test_parser():
@@ -63,6 +69,11 @@ def test_parser():
     assert Module('file_alt.py', _, 1, len(source_alt.split('\n')),
                   None, _, _, all) == module
 
+    module = parse(StringIO(source_alt_nl_at_bracket), 'file_alt_nl.py')
+    assert Module('file_alt_nl.py', _, 1,
+                  len(source_alt_nl_at_bracket.split('\n')), None, _, _,
+                  all) == module
+
 
 def _test_module():