summaryrefslogtreecommitdiff
path: root/astroid
diff options
context:
space:
mode:
authorClaudiu Popa <pcmanticore@gmail.com>2015-09-26 16:06:59 +0300
committerClaudiu Popa <pcmanticore@gmail.com>2015-09-26 16:06:59 +0300
commit7b1a89bd88b2a9fe130fde6e4940b0d4a70c8438 (patch)
tree526340a50553b64794f3b41ccbd59a05aac53815 /astroid
parent8b730e92c8fe8a86106b82c77b2adeaefb0ba38b (diff)
downloadastroid-7b1a89bd88b2a9fe130fde6e4940b0d4a70c8438.tar.gz
Fix pylint errors.
Diffstat (limited to 'astroid')
-rw-r--r--astroid/inference.py2
-rw-r--r--astroid/manager.py6
2 files changed, 3 insertions, 5 deletions
diff --git a/astroid/inference.py b/astroid/inference.py
index 5c77cf5..3f7ab5c 100644
--- a/astroid/inference.py
+++ b/astroid/inference.py
@@ -26,8 +26,6 @@ import functools
import itertools
import operator
-import six
-
from astroid import bases
from astroid import context as contextmod
from astroid import exceptions
diff --git a/astroid/manager.py b/astroid/manager.py
index 6752717..d78515d 100644
--- a/astroid/manager.py
+++ b/astroid/manager.py
@@ -127,7 +127,7 @@ class AstroidManager(object):
return self._build_stub_module(modname)
try:
module = modutils.load_module_from_name(modname)
- except Exception as ex:
+ except Exception as ex: # pylint: disable=broad-except
msg = 'Unable to load module %s (%s)' % (modname, ex)
util.reraise(exceptions.AstroidBuildingException(msg))
return self.ast_from_module(module, modname)
@@ -226,7 +226,7 @@ class AstroidManager(object):
except AttributeError:
msg = 'Unable to get module for %s' % safe_repr(klass)
util.reraise(exceptions.AstroidBuildingException(msg))
- except Exception as ex:
+ except Exception as ex: # pylint: disable=broad-except
msg = ('Unexpected error while retrieving module for %s: %s'
% (safe_repr(klass), ex))
util.reraise(exceptions.AstroidBuildingException(msg))
@@ -235,7 +235,7 @@ class AstroidManager(object):
except AttributeError:
msg = 'Unable to get name for %s' % safe_repr(klass)
util.reraise(exceptions.AstroidBuildingException(msg))
- except Exception as ex:
+ except Exception as ex: # pylint: disable=broad-except
exc = ('Unexpected error while retrieving name for %s: %s'
% (safe_repr(klass), ex))
util.reraise(exceptions.AstroidBuildingException(exc))