diff options
author | Claudiu Popa <cpopa@cloudbasesolutions.com> | 2015-01-10 19:56:08 +0200 |
---|---|---|
committer | Claudiu Popa <cpopa@cloudbasesolutions.com> | 2015-01-10 19:56:08 +0200 |
commit | b87ccb5a644c7405448e5abf2827ab2c8d0e65c1 (patch) | |
tree | 6f023e11e814bc242d8b743b43e7255d1b978cf6 | |
parent | 06f8d7ddf7127065c2ca89b4c3962c4254cb9a40 (diff) | |
download | astroid-b87ccb5a644c7405448e5abf2827ab2c8d0e65c1.tar.gz |
Remove all trailing whitespaces.
-rw-r--r-- | astroid/manager.py | 2 | ||||
-rw-r--r-- | astroid/node_classes.py | 2 | ||||
-rw-r--r-- | astroid/scoped_nodes.py | 4 | ||||
-rw-r--r-- | astroid/tests/unittest_brain.py | 2 | ||||
-rw-r--r-- | astroid/tests/unittest_manager.py | 14 | ||||
-rw-r--r-- | astroid/tests/unittest_scoped_nodes.py | 4 |
6 files changed, 14 insertions, 14 deletions
diff --git a/astroid/manager.py b/astroid/manager.py index dde6758..f5a2404 100644 --- a/astroid/manager.py +++ b/astroid/manager.py @@ -144,7 +144,7 @@ class AstroidManager(OptionsProviderMixIn): if module is not None: return module elif mp_type in (imp.C_BUILTIN, imp.C_EXTENSION): - if mp_type == imp.C_EXTENSION and not self._can_load_extension(modname): + if mp_type == imp.C_EXTENSION and not self._can_load_extension(modname): return self._build_stub_module(modname) try: module = modutils.load_module_from_name(modname) diff --git a/astroid/node_classes.py b/astroid/node_classes.py index 9607f2a..71e512f 100644 --- a/astroid/node_classes.py +++ b/astroid/node_classes.py @@ -46,7 +46,7 @@ def unpack_infer(stmt, context=None): if infered is stmt: yield infered return - # else, infer recursivly, except YES object that should be returned as is + # else, infer recursivly, except YES object that should be returned as is for infered in stmt.infer(context): if infered is YES: yield infered diff --git a/astroid/scoped_nodes.py b/astroid/scoped_nodes.py index e342ea4..8234478 100644 --- a/astroid/scoped_nodes.py +++ b/astroid/scoped_nodes.py @@ -808,8 +808,8 @@ class Function(Statement, Lambda): # but does not contribute to the inheritance structure itself. We inject # a fake class into the hierarchy here for several well-known metaclass # generators, and filter it out later. - if (self.name == 'with_metaclass' and - len(self.args.args) == 1 and + if (self.name == 'with_metaclass' and + len(self.args.args) == 1 and self.args.vararg is not None): metaclass = next(caller.args[0].infer(context)) if isinstance(metaclass, Class): diff --git a/astroid/tests/unittest_brain.py b/astroid/tests/unittest_brain.py index e372501..f4cc631 100644 --- a/astroid/tests/unittest_brain.py +++ b/astroid/tests/unittest_brain.py @@ -82,7 +82,7 @@ class NamedTupleTest(unittest.TestCase): self.assertIs(bases.YES, next(klass.infer())) - @unittest.skipIf(sys.version_info[0] > 2, + @unittest.skipIf(sys.version_info[0] > 2, 'namedtuple inference is broken on Python 3') def test_namedtuple_advanced_inference(self): # urlparse return an object of class ParseResult, which has a diff --git a/astroid/tests/unittest_manager.py b/astroid/tests/unittest_manager.py index 50160dd..04a76db 100644 --- a/astroid/tests/unittest_manager.py +++ b/astroid/tests/unittest_manager.py @@ -181,18 +181,18 @@ class AstroidManagerTest(resources.SysPathSetup, unittest.TestCase): def test_project_node(self): obj = self.manager.project_from_files([resources.find('data')], _silent_no_wrap, 'data') expected = [ - 'data', - 'data.SSL1', + 'data', + 'data.SSL1', 'data.SSL1.Connection1', 'data.absimp', 'data.absimp.sidepackage', 'data.absimp.string', - 'data.absimport', + 'data.absimport', 'data.all', - 'data.appl', + 'data.appl', 'data.appl.myConnection', 'data.clientmodule_test', - 'data.descriptor_crash', + 'data.descriptor_crash', 'data.email', 'data.find_test', 'data.find_test.module', @@ -203,9 +203,9 @@ class AstroidManagerTest(resources.SysPathSetup, unittest.TestCase): 'data.lmfp', 'data.lmfp.foo', 'data.module', - 'data.module1abs', + 'data.module1abs', 'data.module1abs.core', - 'data.module2', + 'data.module2', 'data.noendingnewline', 'data.nonregr', 'data.notall', diff --git a/astroid/tests/unittest_scoped_nodes.py b/astroid/tests/unittest_scoped_nodes.py index e4befa9..095a8be 100644 --- a/astroid/tests/unittest_scoped_nodes.py +++ b/astroid/tests/unittest_scoped_nodes.py @@ -61,7 +61,7 @@ class ModuleNodeTest(ModuleLoader, unittest.TestCase): self.assertEqual(self.module.getattr('__doc__')[0].value, 'test module for astroid\n') self.assertEqual(len(self.module.getattr('__file__')), 1) self.assertIsInstance(self.module.getattr('__file__')[0], nodes.Const) - self.assertEqual(self.module.getattr('__file__')[0].value, + self.assertEqual(self.module.getattr('__file__')[0].value, os.path.abspath(resources.find('data/module.py'))) self.assertEqual(len(self.module.getattr('__dict__')), 1) self.assertIsInstance(self.module.getattr('__dict__')[0], nodes.Dict) @@ -286,7 +286,7 @@ class FunctionNodeTest(ModuleLoader, unittest.TestCase): def test_format_args(self): func = self.module2['make_class'] - self.assertEqual(func.args.format_args(), + self.assertEqual(func.args.format_args(), 'any, base=data.module.YO, *args, **kwargs') func = self.module['four_args'] self.assertEqual(func.args.format_args(), 'a, b, c, d') |