Fix PyCQA#182

Author: Nurdok

src/pydocstyle.py

@@ -486,6 +486,18 @@ def parse_definition(self, class_):
                   self.current.value)
         return definition
 
+    def check_current(self, kind=None, value=None):
+        msg = """Error at line {self.line}:
+
+        In file: {self.filename}
+
+        Got kind {self.current.kind!r}
+        Got value {self.current.value}
+        """.format(self=self)
+        kind_valid = self.current.kind == kind if kind else True
+        value_valid = self.current.value == value if value else True
+        assert kind_valid and value_valid, msg
+
     def parse_from_import_statement(self):
         """Parse a 'from x import y' statement.
 
@@ -495,9 +507,12 @@ def parse_from_import_statement(self):
         log.debug('parsing from/import statement.')
         assert self.current.value == 'from', self.current.value
         self.stream.move()
-        if self.current.value != '__future__':
-            return
+        is_future_import = self.current.value == '__future__'
         self.stream.move()
+        while (self.current.kind in (tk.DOT, tk.NAME, tk.OP) and
+               self.current.value != 'import'):
+            self.stream.move()
+        self.check_current(value='import')
         assert self.current.value == 'import', self.current.value
         self.stream.move()
         if self.current.value == '(':
@@ -512,8 +527,9 @@ def parse_from_import_statement(self):
                 continue
             log.debug("parsing import, token is %r (%s)",
                       self.current.kind, self.current.value)
-            log.debug('found future import: %s', self.current.value)
-            self.future_imports[self.current.value] = True
+            if is_future_import:
+                log.debug('found future import: %s', self.current.value)
+                self.future_imports[self.current.value] = True
             self.consume(tk.NAME)
             log.debug("parsing import, token is %r (%s)",
                       self.current.kind, self.current.value)

src/tests/test_cases/all_import.py

@@ -0,0 +1,18 @@
+"""A valid module docstring."""
+
+from .all_import_aux import __all__ as not_dunder_all
+from .expected import Expectation
+
+expectation = Expectation()
+expect = expectation.expect
+
+__all__ = ('public_func', )
+
+
+@expect("D103: Missing docstring in public function")
+def public_func():
+    pass
+
+
+def private_func():
+    pass

src/tests/test_cases/all_import_aux.py

@@ -0,0 +1 @@
+__all__ = ('this', 'is', 'a', 'helper', 'file')

src/tests/test_definitions.py

@@ -260,6 +260,7 @@ def test_token_stream():
     'capitalization',
     'comment_after_def_bug',
     'multi_line_summary_start',
+    'all_import',
 ])
 def test_pep257(test_case):
     """Run domain-specific tests from test.py file."""