Fix bugs introduced by merge and formatting

6 files changed, 18 insertions, 17 deletions

diff --git a/astroid/brain/pysix_moves.py b/astroid/brain/pysix_moves.py
index f56726d..f216ae7 100644
--- a/astroid/brain/pysix_moves.py
+++ b/astroid/brain/pysix_moves.py
@@ -285,4 +285,4 @@ register_module_extender(MANAGER, 'six', six_moves_transform)
 register_module_extender(MANAGER, 'requests.packages.urllib3.packages.six',
                          six_moves_transform)
 MANAGER.register_failed_import_hook(_six_fail_hook)
-MANAGER.register_transform(nodes.Class, transform_six_add_metaclass)
+MANAGER.register_transform(nodes.ClassDef, transform_six_add_metaclass)
diff --git a/astroid/inference.py b/astroid/inference.py
index c124d3b..30e0228 100644
--- a/astroid/inference.py
+++ b/astroid/inference.py
@@ -702,7 +702,7 @@ def infer_empty_node(self, context=None):
     else:
         try:
             for inferred in MANAGER.infer_ast_from_something(self.object,
-                                                            context=context):
+                                                             context=context):
                 yield inferred
         except AstroidError:
             yield YES
diff --git a/astroid/rebuilder.py b/astroid/rebuilder.py
index 3cd21c7..bc1b0e7 100644
--- a/astroid/rebuilder.py
+++ b/astroid/rebuilder.py
@@ -142,7 +142,6 @@ class TreeRebuilder(object):
         return self._transform(newnode)
 
     def visit(self, node, parent, assign_ctx=None):
-        # print('Debug:', dump(node), parent)
         cls = node.__class__
         if cls in self._visit_meths:
             visit_method = self._visit_meths[cls]
@@ -774,7 +773,7 @@ class TreeRebuilder3(TreeRebuilder):
     def visit_nameconstant(self, node, parent, assign_ctx=None):
         # in Python 3.4 we have NameConstant for True / False / None
         return new.Const(node.value, getattr(node, 'lineno', None),
-                            getattr(node, 'col_offset', None), parent)
+                         getattr(node, 'col_offset', None), parent)
 
     # def visit_arguments(self, node, parent, assign_ctx=None):
     #     return super(TreeRebuilder3, self).visit_arguments(
@@ -833,7 +832,7 @@ class TreeRebuilder3(TreeRebuilder):
         if 'items' not in node._fields:
             # python < 3.3
             return super(TreeRebuilder3, self).visit_with(node, parent,
-                                                           assign_ctx)
+                                                          assign_ctx)
 
         newnode = new.With(node.lineno, node.col_offset, parent)
         def visit_child(child):
@@ -844,8 +843,8 @@ class TreeRebuilder3(TreeRebuilder):
                 var = None
             return expr, var
         newnode.postinit([visit_child(child) for child in node.items],
-                          [self.visit(child, newnode, None)
-                           for child in node.body])
+                         [self.visit(child, newnode, None)
+                          for child in node.body])
         return newnode
 
     def visit_yieldfrom(self, node, parent, assign_ctx=None):
@@ -856,8 +855,8 @@ class TreeRebuilder3(TreeRebuilder):
 
     def visit_classdef(self, node, parent, assign_ctx=None):
         return super(TreeRebuilder3, self).visit_classdef(node, parent,
-                                                           assign_ctx,
-                                                           True)
+                                                          assign_ctx,
+                                                          True)
 
 if sys.version_info >= (3, 0):
     TreeRebuilder = TreeRebuilder3
diff --git a/astroid/scoped_nodes.py b/astroid/scoped_nodes.py
index 1837662..17ab975 100644
--- a/astroid/scoped_nodes.py
+++ b/astroid/scoped_nodes.py
@@ -764,7 +764,8 @@ class FunctionDef(bases.Statement, Lambda):
     _type = "function"
     _other_fields = ('locals', 'name', 'doc', '_type', 'decorators')
 
-    def __init__(self, name, doc, lineno=None, col_offset=None, parent=None):
+    def __init__(self, name=None, doc=None, lineno=None,
+                 col_offset=None, parent=None):
         self.name = name
         self.doc = doc
         self.extra_decorators = []
@@ -1030,7 +1031,8 @@ class ClassDef(bases.Statement, LocalsDictNodeNG, mixins.FilterStmtsMixin):
                     "'metaclass' | 'exception'")
     _other_fields = ('locals', 'globals', 'name', 'doc')
 
-    def __init__(self, name, doc, lineno=None, col_offset=None, parent=None):
+    def __init__(self, name=None, doc=None, lineno=None,
+                 col_offset=None, parent=None):
         self.instance_attrs = {}
         self.locals = {}
         self.bases = []
@@ -1330,14 +1332,14 @@ class ClassDef(bases.Statement, LocalsDictNodeNG, mixins.FilterStmtsMixin):
         context.lookupname = name
         try:
             for inferred in bases._infer_stmts(self.getattr(name, context),
-                                              context, frame=self):
+                                               context, frame=self):
                 # yield YES object instead of descriptors when necessary
                 if (not isinstance(inferred, node_classes.Const)
                     and isinstance(inferred, bases.Instance)):
                     try:
                         inferred._proxied.getattr('__get__', context)
                     except exceptions.NotFoundError:
-                        yield inferred
+                    yield inferred
                     else:
                         yield bases.YES
                 else:
diff --git a/astroid/tests/unittest_scoped_nodes.py b/astroid/tests/unittest_scoped_nodes.py
index 000e70b..a03abed 100644
--- a/astroid/tests/unittest_scoped_nodes.py
+++ b/astroid/tests/unittest_scoped_nodes.py
@@ -1060,7 +1060,7 @@ class ClassNodeTest(ModuleLoader, unittest.TestCase):
         ''')
         inferred = next(klass.infer())
         metaclass = inferred.metaclass()
-        self.assertIsInstance(metaclass, scoped_nodes.Class)
+        self.assertIsInstance(metaclass, scoped_nodes.ClassDef)
         self.assertEqual(metaclass.qname(), 'abc.ABCMeta')
 
     def test_using_invalid_six_add_metaclass_call(self):
diff --git a/tox.ini b/tox.ini
index b694d5f..3abca02 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,11 @@
 [tox]

 # official list is

 #envlist = py27, py33, py34, pypy, jython

-envlist = py27, py34

+envlist = py27, py34, pylint

 

 [testenv:pylint]

 deps = 

-  lazy_object_proxy

+  lazy-object-proxy

   logilab-common

   six

   hg+https://bitbucket.org/logilab/astroid

@@ -14,7 +14,7 @@ commands = pylint -rn --rcfile={toxinidir}/pylintrc {envsitepackagesdir}/astroid
 

 [testenv]

 deps =

-  lazy_object_proxy

+  lazy-object-proxy

   logilab-common

   six