Make tests pass

pylint-dev · Feb 13, 2017 · 3c8b44f · 3c8b44f
1 parent e80ed4c
commit 3c8b44f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/pylint/checkers/imports.py b/pylint/checkers/imports.py
@@ -746,8  746,11 @@ def _check_wildcard_imports(self, node):
     def _wildcard_import_is_allowed(self, node):
         if not self.config.allow_wildcard_with_all:
             return False
-        module = node.do_import_module()
-        return '__all__' in module.locals
         try:
             module = node.do_import_module()
             return '__all__' in module.locals
         except astroid.AstroidImportError:
             return False
 
 
 def register(linter):

diff --git a/pylint/test/functional/wildcard_import_allowed.py b/pylint/test/functional/wildcard_import_allowed.py
@@ -1,4  1,4 @@
-# pylint: disable=missing-docstring,unused-wildcard-import,redefined-builtin
 # pylint: disable=missing-docstring,unused-wildcard-import,redefined-builtin,import-error
 from csv import *
 from abc import *  # [wildcard-import]
 from UNINFERABLE import *  # [wildcard-import]