summaryrefslogtreecommitdiff
path: root/builder.py
diff options
context:
space:
mode:
authorSylvain Thénault <sylvain.thenault@logilab.fr>2014-07-24 16:16:46 +0200
committerSylvain Thénault <sylvain.thenault@logilab.fr>2014-07-24 16:16:46 +0200
commit34f9964e4bc3a209b1e137e6ae3dd7157fb7cdab (patch)
treef6f19fce349fcf63e6981a20b96080a0e6036f11 /builder.py
parentbe87286f6b843e0191c9209c64ad1533fdd99d87 (diff)
downloadastroid-git-34f9964e4bc3a209b1e137e6ae3dd7157fb7cdab.tar.gz
Fix names grabed using wildcard import in "absolute import mode"
(ie with absolute_import activated from the __future__ or with python 3). To do so, refactor do_import_module a bit so it may be easily used for wildcard import as well. Fix pylint issue #58.
Diffstat (limited to 'builder.py')
-rw-r--r--builder.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/builder.py b/builder.py
index f419ae3b..83c2ba5d 100644
--- a/builder.py
+++ b/builder.py
@@ -1,4 +1,4 @@
-# copyright 2003-2013 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
+# copyright 2003-2014 LOGILAB S.A. (Paris, FRANCE), all rights reserved.
# contact http://www.logilab.fr/ -- mailto:contact@logilab.fr
#
# This file is part of astroid.
@@ -186,8 +186,8 @@ class AstroidBuilder(InspectBuilder):
for (name, asname) in node.names:
if name == '*':
try:
- imported = node.root().import_module(node.modname)
- except AstroidBuildingException:
+ imported = node.do_import_module()
+ except InferenceError:
continue
for name in imported.wildcard_import_names():
node.parent.set_local(name, node)