Fix bad-continuation errors from astroid.

7 files changed, 46 insertions, 47 deletions

diff --git a/astroid/protocols.py b/astroid/protocols.py
index fc7f10d..dbe3239 100644
--- a/astroid/protocols.py
+++ b/astroid/protocols.py
@@ -25,10 +25,10 @@ import collections
 from astroid.exceptions import InferenceError, NoDefault, NotFoundError
 from astroid.node_classes import unpack_infer
 from astroid.bases import (
-     InferenceContext, copy_context,
-     raise_if_nothing_infered, yes_if_nothing_infered,
-     Instance, YES, BoundMethod,
-     Generator,
+    InferenceContext, copy_context,
+    raise_if_nothing_infered, yes_if_nothing_infered,
+    Instance, YES, BoundMethod,
+    Generator,
 )
 from astroid.nodes import const_factory
 from astroid import nodes
diff --git a/astroid/scoped_nodes.py b/astroid/scoped_nodes.py
index 626d8f8..b8140d3 100644
--- a/astroid/scoped_nodes.py
+++ b/astroid/scoped_nodes.py
@@ -36,17 +36,21 @@ from logilab.common.compat import builtins
 from logilab.common.decorators import cached, cachedproperty
 
 from astroid.exceptions import (
-     NotFoundError,
-     AstroidBuildingException,
-     InferenceError, MroError,
-     DuplicateBasesError, InconsistentMroError,
+    NotFoundError,
+    AstroidBuildingException,
+    InferenceError, MroError,
+    DuplicateBasesError, InconsistentMroError,
+)
+from astroid.node_classes import (
+    Const, DelName, DelAttr,
+    Dict, From, List, Pass, Raise, Return, Tuple, Yield, YieldFrom,
+    LookupMixIn, const_factory as cf, unpack_infer, CallFunc,
+)
+from astroid.bases import (
+    NodeNG, InferenceContext, Instance, copy_context,
+    YES, Generator, UnboundMethod, BoundMethod, _infer_stmts,
+    BUILTINS,
 )
-from astroid.node_classes import Const, DelName, DelAttr, \
-     Dict, From, List, Pass, Raise, Return, Tuple, Yield, YieldFrom, \
-     LookupMixIn, const_factory as cf, unpack_infer, CallFunc
-from astroid.bases import NodeNG, InferenceContext, Instance, copy_context, \
-     YES, Generator, UnboundMethod, BoundMethod, _infer_stmts, \
-     BUILTINS
 from astroid.mixins import FilterStmtsMixin
 from astroid.bases import Statement
 from astroid.manager import AstroidManager
@@ -726,7 +730,7 @@ class Function(Statement, Lambda):
         lineno = self.lineno
         if self.decorators is not None:
             lineno += sum(node.tolineno - node.lineno + 1
-                                   for node in self.decorators.nodes)
+                          for node in self.decorators.nodes)
 
         return lineno
 
diff --git a/astroid/tests/unittest_brain.py b/astroid/tests/unittest_brain.py
index 228d705..21b4265 100644
--- a/astroid/tests/unittest_brain.py
+++ b/astroid/tests/unittest_brain.py
@@ -108,7 +108,6 @@ class NamedTupleTest(unittest.TestCase):
         """)
         self.assertIs(bases.YES, next(klass.infer()))
 
-
     @unittest.skipIf(sys.version_info[0] > 2,
                      'namedtuple inference is broken on Python 3')
     def test_namedtuple_advanced_inference(self):
diff --git a/astroid/tests/unittest_builder.py b/astroid/tests/unittest_builder.py
index 3df9d36..14ce5be 100644
--- a/astroid/tests/unittest_builder.py
+++ b/astroid/tests/unittest_builder.py
@@ -604,8 +604,8 @@ class FileBuildTest(unittest.TestCase):
         self.assertIs(_locals, module.globals)
         keys = sorted(_locals.keys())
         should = ['MY_DICT', 'YO', 'YOUPI',
-                '__revision__', 'global_access', 'modutils', 'four_args',
-                 'os', 'redirect', 'pb', 'LocalsVisitor', 'ASTWalker']
+                  '__revision__', 'global_access', 'modutils', 'four_args',
+                  'os', 'redirect', 'pb', 'LocalsVisitor', 'ASTWalker']
         should.sort()
         self.assertEqual(keys, should)
 
@@ -659,7 +659,7 @@ class FileBuildTest(unittest.TestCase):
         keys = locals2.keys()
         self.assertEqual(sorted(keys),
                          ['__init__', 'class_attr', 'class_method',
-                         'method', 'static_method'])
+                          'method', 'static_method'])
 
     def test_class_instance_attrs(self):
         module = self.module
diff --git a/astroid/tests/unittest_inference.py b/astroid/tests/unittest_inference.py
index 230279f..c2c3889 100644
--- a/astroid/tests/unittest_inference.py
+++ b/astroid/tests/unittest_inference.py
@@ -620,8 +620,7 @@ class InferenceTest(resources.SysPathSetup, unittest.TestCase):
                         fct(a_line)
         '''
         ast = test_utils.build_module(code, __name__)
-        self.assertEqual(len(list(ast['process_line'].infer_call_result(
-                                                                None))), 3)
+        self.assertEqual(len(list(ast['process_line'].infer_call_result(None))), 3)
         self.assertEqual(len(list(ast['tupletest'].infer())), 3)
         values = ['Function(first_word)', 'Function(last_word)', 'Const(NoneType)']
         self.assertEqual([str(infered)
@@ -657,8 +656,8 @@ class InferenceTest(resources.SysPathSetup, unittest.TestCase):
                 return something.conjugate()
         '''
         ast = test_utils.build_module(code, __name__)
-        self.assertEqual([i.value for i in
-                test_utils.get_name_node(ast, 'something', -1).infer()], [1.0, 1.0j])
+        values = [i.value for i in test_utils.get_name_node(ast, 'something', -1).infer()]
+        self.assertEqual(values, [1.0, 1.0j])
 
 
     def test_simple_subscript(self):
@@ -674,13 +673,13 @@ class InferenceTest(resources.SysPathSetup, unittest.TestCase):
         '''
         ast = test_utils.build_module(code, __name__)
         self.assertEqual([i.value for i in
-                                test_utils.get_name_node(ast, 'a', -1).infer()], [1])
+                          test_utils.get_name_node(ast, 'a', -1).infer()], [1])
         self.assertEqual([i.value for i in
-                                test_utils.get_name_node(ast, 'b', -1).infer()], [2])
+                          test_utils.get_name_node(ast, 'b', -1).infer()], [2])
         self.assertEqual([i.value for i in
-                                test_utils.get_name_node(ast, 'c', -1).infer()], [3])
+                          test_utils.get_name_node(ast, 'c', -1).infer()], [3])
         self.assertEqual([i.value for i in
-                                test_utils.get_name_node(ast, 'd', -1).infer()], [6])
+                          test_utils.get_name_node(ast, 'd', -1).infer()], [6])
         self.assertEqual([i.value for i in
                           test_utils.get_name_node(ast, 'f', -1).infer()], ['value'])
 
@@ -707,16 +706,15 @@ class InferenceTest(resources.SysPathSetup, unittest.TestCase):
         '''
         ast = test_utils.build_module(code, __name__)
         self.assertEqual([i.value for i in
-                            test_utils.get_name_node(ast, 'a', -1).infer()], [1, 2, 3])
+                          test_utils.get_name_node(ast, 'a', -1).infer()], [1, 2, 3])
         self.assertEqual([i.value for i in
-                            test_utils.get_name_node(ast, 'b', -1).infer()], [1, 3])
+                          test_utils.get_name_node(ast, 'b', -1).infer()], [1, 3])
         self.assertEqual([i.value for i in
-                            test_utils.get_name_node(ast, 'c', -1).infer()], [2, 4])
+                          test_utils.get_name_node(ast, 'c', -1).infer()], [2, 4])
         self.assertEqual([i.value for i in
-                            test_utils.get_name_node(ast, 'd', -1).infer()], [2, 4])
+                          test_utils.get_name_node(ast, 'd', -1).infer()], [2, 4])
         self.assertEqual([i.value for i in
-                            test_utils.get_name_node(ast, 'e', -1).infer()], [1, 3])
-
+                          test_utils.get_name_node(ast, 'e', -1).infer()], [1, 3])
 
     def test_simple_for_genexpr(self):
         code = '''
@@ -724,9 +722,9 @@ class InferenceTest(resources.SysPathSetup, unittest.TestCase):
         '''
         ast = test_utils.build_module(code, __name__)
         self.assertEqual([i.value for i in
-                            test_utils.get_name_node(ast, 'd', -1).infer()], [2, 4])
+                          test_utils.get_name_node(ast, 'd', -1).infer()], [2, 4])
         self.assertEqual([i.value for i in
-                            test_utils.get_name_node(ast, 'e', -1).infer()], [1, 3])
+                          test_utils.get_name_node(ast, 'e', -1).infer()], [1, 3])
 
 
     def test_builtin_help(self):
@@ -1067,7 +1065,7 @@ class InferenceTest(resources.SysPathSetup, unittest.TestCase):
         decorators = set(['%s.property' % BUILTINS])
         ast = test_utils.build_module(code, __name__)
         self.assertEqual(ast['SendMailController']['smtp'].decoratornames(),
-                          decorators)
+                         decorators)
         propinfered = list(ast.body[2].value.infer())
         self.assertEqual(len(propinfered), 1)
         propinfered = propinfered[0]
@@ -1075,7 +1073,7 @@ class InferenceTest(resources.SysPathSetup, unittest.TestCase):
         self.assertEqual(propinfered.name, 'SMTP')
         self.assertEqual(propinfered.root().name, 'smtplib')
         self.assertEqual(ast['SendMailController']['me'].decoratornames(),
-                          decorators)
+                         decorators)
         propinfered = list(ast.body[3].value.infer())
         self.assertEqual(len(propinfered), 1)
         propinfered = propinfered[0]
@@ -1083,7 +1081,6 @@ class InferenceTest(resources.SysPathSetup, unittest.TestCase):
         self.assertEqual(propinfered.name, 'SendMailController')
         self.assertEqual(propinfered.root().name, __name__)
 
-
     def test_im_func_unwrap(self):
         code = '''
             class EnvBasedTC:
diff --git a/astroid/tests/unittest_scoped_nodes.py b/astroid/tests/unittest_scoped_nodes.py
index 2d37589..e61f427 100644
--- a/astroid/tests/unittest_scoped_nodes.py
+++ b/astroid/tests/unittest_scoped_nodes.py
@@ -26,9 +26,9 @@ import warnings
 
 from astroid import YES, builder, nodes, scoped_nodes
 from astroid.exceptions import (
-     InferenceError, NotFoundError,
-     NoDefault, ResolveError, MroError,
-     InconsistentMroError, DuplicateBasesError,
+    InferenceError, NotFoundError,
+    NoDefault, ResolveError, MroError,
+    InconsistentMroError, DuplicateBasesError,
 )
 from astroid.bases import (
     BUILTINS, Instance,
@@ -132,7 +132,7 @@ class ModuleNodeTest(ModuleLoader, unittest.TestCase):
         astroid = test_utils.build_module(data, __name__)
         # test del statement not returned by getattr
         self.assertEqual(len(astroid.getattr('appli')), 2,
-                          astroid.getattr('appli'))
+                         astroid.getattr('appli'))
 
     def test_relative_to_absolute_name(self):
         # package
@@ -725,7 +725,7 @@ class ClassNodeTest(ModuleLoader, unittest.TestCase):
                                   ('Concrete23', ['MyIFace', 'AnotherIFace'])):
             klass = self.module2[klass]
             self.assertEqual([i.name for i in klass.interfaces()],
-                              interfaces)
+                             interfaces)
 
     def test_concat_interfaces(self):
         astroid = test_utils.build_module('''
@@ -744,7 +744,7 @@ class ClassNodeTest(ModuleLoader, unittest.TestCase):
                 __implements__ = BadArgument.__implements__ + Correct2.__implements__
         ''')
         self.assertEqual([i.name for i in astroid['InterfaceCanNowBeFound'].interfaces()],
-                          ['IMachin'])
+                         ['IMachin'])
 
     def test_inner_classes(self):
         eee = self.nonregr['Ccc']['Eee']
@@ -764,8 +764,7 @@ class ClassNodeTest(ModuleLoader, unittest.TestCase):
         astroid = test_utils.build_module(data, __name__)
         cls = astroid['WebAppObject']
         self.assertEqual(sorted(cls.locals.keys()),
-                          ['appli', 'config', 'registered', 'schema'])
-
+                         ['appli', 'config', 'registered', 'schema'])
 
     def test_class_getattr(self):
         data = '''
diff --git a/pylintrc b/pylintrc
index 8b64519..1744d56 100644
--- a/pylintrc
+++ b/pylintrc
@@ -92,7 +92,7 @@ confidence=
 # no Warning level messages displayed, use"--disable=all --enable=classes


 # --disable=W"

 disable=all

-enable=trailing-whitespace, bad-whitespace, unused-import, unused-variable

+enable=trailing-whitespace, bad-whitespace, unused-import, unused-variable,bad-continuation

 

 

 [BASIC]