Fix linting

12 files changed, 28 insertions, 32 deletions

diff --git a/astroid/arguments.py b/astroid/arguments.py
index 3ae8b958..bc82c688 100644
--- a/astroid/arguments.py
+++ b/astroid/arguments.py
@@ -227,7 +227,7 @@ class CallSite(object):
             kwarg.postinit([(nodes.const_factory(key), value)
                             for key, value in kwargs.items()])
             return iter((kwarg, ))
-        elif funcnode.args.vararg == name:
+        if funcnode.args.vararg == name:
             # It wants all the args that were passed into
             # the call site.
             if self.has_invalid_arguments():
diff --git a/astroid/context.py b/astroid/context.py
index 3e2e1f51..626ea380 100644
--- a/astroid/context.py
+++ b/astroid/context.py
@@ -99,7 +99,6 @@ class InferenceContext(object):
             yield result
 
         self.inferred[key] = tuple(results)
-        return
 
     @contextlib.contextmanager
     def restore_path(self):
diff --git a/astroid/helpers.py b/astroid/helpers.py
index 14148ad8..6ed08f2f 100644
--- a/astroid/helpers.py
+++ b/astroid/helpers.py
@@ -260,9 +260,8 @@ def object_len(node, context=None):
         # Remove StopIteration catch when #507 is fixed
     except StopIteration:
         raise exceptions.InferenceError(node=node)
-    if (isinstance(result_of_len, nodes.Const) and result_of_len.pytype() == "builtins.int"):
+    if isinstance(result_of_len, nodes.Const) and result_of_len.pytype() == "builtins.int":
         return result_of_len.value
-    else:
-        raise exceptions.AstroidTypeError(
-            "'{}' object cannot be interpreted as an integer"
-            .format(result_of_len))
+    raise exceptions.AstroidTypeError(
+        "'{}' object cannot be interpreted as an integer"
+        .format(result_of_len))
diff --git a/astroid/interpreter/dunder_lookup.py b/astroid/interpreter/dunder_lookup.py
index 424ed01f..80ab07fb 100644
--- a/astroid/interpreter/dunder_lookup.py
+++ b/astroid/interpreter/dunder_lookup.py
@@ -48,9 +48,9 @@ def lookup(node, name):
                          astroid.Dict,
                          astroid.Set)):
         return _builtin_lookup(node, name)
-    elif isinstance(node, astroid.Instance):
+    if isinstance(node, astroid.Instance):
         return _lookup_in_mro(node, name)
-    elif isinstance(node, astroid.ClassDef):
+    if isinstance(node, astroid.ClassDef):
         return _class_lookup(node, name)
 
     raise exceptions.AttributeInferenceError(
diff --git a/astroid/manager.py b/astroid/manager.py
index 72ac930d..271c5360 100644
--- a/astroid/manager.py
+++ b/astroid/manager.py
@@ -74,7 +74,7 @@ class AstroidManager(object):
         if source:
             from astroid.builder import AstroidBuilder
             return AstroidBuilder(self).file_build(filepath, modname)
-        elif fallback and modname:
+        if fallback and modname:
             return self.ast_from_module_name(modname)
         raise exceptions.AstroidBuildingError(
             'Unable to build an AST for {path}.', path=filepath)
diff --git a/astroid/modutils.py b/astroid/modutils.py
index 07e14aed..edabcd5b 100644
--- a/astroid/modutils.py
+++ b/astroid/modutils.py
@@ -126,10 +126,9 @@ def _path_from_filename(filename, is_jython=IS_JYTHON):
     if not is_jython:
         if sys.version_info > (3, 0):
             return filename
-        else:
-            if filename.endswith(".pyc"):
-                return filename[:-1]
-            return filename
+        if filename.endswith(".pyc"):
+            return filename[:-1]
+        return filename
     head, has_pyclass, _ = filename.partition("$py.class")
     if has_pyclass:
         return head + ".py"
diff --git a/astroid/node_classes.py b/astroid/node_classes.py
index 5b65dc13..73c69703 100644
--- a/astroid/node_classes.py
+++ b/astroid/node_classes.py
@@ -179,7 +179,7 @@ def _container_getitem(instance, elts, index, context=None):
             new_cls.elts = elts[index_slice]
             new_cls.parent = instance.parent
             return new_cls
-        elif isinstance(index, Const):
+        if isinstance(index, Const):
             return elts[index.value]
     except IndexError as exc:
         raise exceptions.AstroidIndexError(
@@ -654,7 +654,7 @@ class NodeNG(object):
 
     def _infer_name(self, frame, name):
         # overridden for ImportFrom, Import, Global, TryExcept and Arguments
-        return None
+        pass
 
     def _infer(self, context=None):
         """we don't know how to resolve a statement by default"""
@@ -743,6 +743,7 @@ class NodeNG(object):
         :returns: The string representation of the AST.
         :rtype: str
         """
+        # pylint: disable=too-many-statements
         @_singledispatch
         def _repr_tree(node, result, done, cur_indent='', depth=1):
             """Outputs a representation of a non-tuple/list, non-node that's
@@ -795,8 +796,8 @@ class NodeNG(object):
                 result.append(indent + '<Recursion on %s with id=%s' %
                               (type(node).__name__, id(node)))
                 return False
-            else:
-                done.add(node)
+            done.add(node)
+
             if max_depth and depth > max_depth:
                 result.append('...')
                 return False
@@ -2763,9 +2764,8 @@ class ExceptHandler(mixins.MultiLineBlockMixin,
         """
         if self.name:
             return self.name.tolineno
-        elif self.type:
+        if self.type:
             return self.type.tolineno
-
         return self.lineno
 
     def catch(self, exceptions): # pylint: disable=redefined-outer-name
diff --git a/astroid/rebuilder.py b/astroid/rebuilder.py
index ba99741f..6f857441 100644
--- a/astroid/rebuilder.py
+++ b/astroid/rebuilder.py
@@ -130,9 +130,9 @@ class TreeRebuilder(object):
             if PY37 and hasattr(node, 'docstring'):
                 doc = node.docstring
                 return node, doc
-            elif (node.body
-                  and isinstance(node.body[0], self._parser_module.Expr)
-                  and isinstance(node.body[0].value, self._parser_module.Str)):
+            if (node.body
+                    and isinstance(node.body[0], self._parser_module.Expr)
+                    and isinstance(node.body[0].value, self._parser_module.Str)):
                 doc = node.body[0].value.s
                 node.body = node.body[1:]
                 return node, doc
diff --git a/astroid/scoped_nodes.py b/astroid/scoped_nodes.py
index ccc70e87..664c123e 100644
--- a/astroid/scoped_nodes.py
+++ b/astroid/scoped_nodes.py
@@ -547,7 +547,6 @@ class Module(LocalsDictNodeNG):
         :returns: The previous sibling statement node.
         :rtype: NodeNG or None
         """
-        return
 
     def next_sibling(self):
         """The next sibling statement node.
@@ -555,7 +554,6 @@ class Module(LocalsDictNodeNG):
         :returns: The next sibling statement node.
         :rtype: NodeNG or None
         """
-        return
 
     _absolute_import_activated = True
 
@@ -1389,10 +1387,10 @@ class FunctionDef(mixins.MultiLineBlockMixin, node_classes.Statement, Lambda):
         if isinstance(frame, ClassDef):
             if self.name == '__new__':
                 return 'classmethod'
-            elif sys.version_info >= (3, 6) and self.name == '__init_subclass__':
+            if sys.version_info >= (3, 6) and self.name == '__init_subclass__':
                 return 'classmethod'
-            else:
-                type_name = 'method'
+
+            type_name = 'method'
 
         if not self.decorators:
             return type_name
@@ -1429,7 +1427,7 @@ class FunctionDef(mixins.MultiLineBlockMixin, node_classes.Statement, Lambda):
                             continue
                         if ancestor.is_subtype_of('%s.classmethod' % BUILTINS):
                             return 'classmethod'
-                        elif ancestor.is_subtype_of('%s.staticmethod' % BUILTINS):
+                        if ancestor.is_subtype_of('%s.staticmethod' % BUILTINS):
                             return 'staticmethod'
             except exceptions.InferenceError:
                 pass
diff --git a/astroid/tests/unittest_manager.py b/astroid/tests/unittest_manager.py
index 34bb415b..d18235f6 100644
--- a/astroid/tests/unittest_manager.py
+++ b/astroid/tests/unittest_manager.py
@@ -257,8 +257,8 @@ class AstroidManagerTest(resources.SysPathSetup,
         def hook(modname):
             if modname == 'foo.bar':
                 return unittest
-            else:
-                raise exceptions.AstroidBuildingError()
+
+            raise exceptions.AstroidBuildingError()
 
         with self.assertRaises(exceptions.AstroidBuildingError):
             self.manager.ast_from_module_name('foo.bar')
diff --git a/astroid/transforms.py b/astroid/transforms.py
index 4afba2d3..42045dc4 100644
--- a/astroid/transforms.py
+++ b/astroid/transforms.py
@@ -52,7 +52,7 @@ class TransformVisitor(object):
     def _visit_generic(self, node):
         if isinstance(node, list):
             return [self._visit_generic(child) for child in node]
-        elif isinstance(node, tuple):
+        if isinstance(node, tuple):
             return tuple(self._visit_generic(child) for child in node)
 
         return self._visit(node)
diff --git a/tox.ini b/tox.ini
index d44c50dd..ac1fda6f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,6 +5,7 @@ skip_missing_interpreters = true
 [testenv:pylint]
 deps =
    git+https://github.com/pycqa/pylint@master
+   pytest
 commands = pylint -rn --rcfile={toxinidir}/pylintrc {toxinidir}/astroid
 
 # Use pylint master when version info is fixed