Fix most obvious errors intorduced by the latest merge

13 files changed, 33 insertions, 74 deletions

diff --git a/astroid/bases.py b/astroid/bases.py
index 98c8149e..d19db3aa 100644
--- a/astroid/bases.py
+++ b/astroid/bases.py
@@ -99,7 +99,7 @@ def _infer_stmts(stmts, context, frame=None):
             for inferred in stmt.infer(context=context):
                 yield inferred
                 inferred = True
-        except excpetions.UnresolvableName:
+        except exceptions.UnresolvableName:
             continue
         except exceptions.InferenceError:
             yield util.YES
diff --git a/astroid/brain/builtin_inference.py b/astroid/brain/builtin_inference.py
index 33f086f0..0a96ebed 100644
--- a/astroid/brain/builtin_inference.py
+++ b/astroid/brain/builtin_inference.py
@@ -119,7 +119,7 @@ def _generic_inference(node, context, node_type, transform):
             inferred = next(arg.infer(context=context))
         except (InferenceError, StopIteration):
             raise UseInferenceDefault()
-        if infered is util.YES:
+        if inferred is util.YES:
             raise UseInferenceDefault()
         transformed = transform(inferred)
     if not transformed or transformed is util.YES:
diff --git a/astroid/context.py b/astroid/context.py
index 3e420d76..bb2422ae 100644
--- a/astroid/context.py
+++ b/astroid/context.py
@@ -26,14 +26,14 @@ from astroid import util
 
 
 class InferenceContext(object):
-    __slots__ = ('path', 'lookupname', 'callcontext', 'boundnode', 'infered')
+    __slots__ = ('path', 'lookupname', 'callcontext', 'boundnode', 'inferred')
 
-    def __init__(self, path=None, infered=None):
+    def __init__(self, path=None, inferred=None):
         self.path = path or set()
         self.lookupname = None
         self.callcontext = None
         self.boundnode = None
-        self.infered = infered or {}
+        self.inferred = inferred or {}
 
     def push(self, node):
         name = self.lookupname
@@ -43,7 +43,7 @@ class InferenceContext(object):
 
     def clone(self):
         # XXX copy lookupname/callcontext ?
-        clone = InferenceContext(self.path, infered=self.infered)
+        clone = InferenceContext(self.path, inferred=self.inferred)
         clone.callcontext = self.callcontext
         clone.boundnode = self.boundnode
         return clone
@@ -54,7 +54,7 @@ class InferenceContext(object):
             results.append(result)
             yield result
 
-        self.infered[key] = tuple(results)
+        self.inferred[key] = tuple(results)
         return
 
     @contextlib.contextmanager
@@ -79,12 +79,12 @@ class CallContext(object):
     @staticmethod
     def _infer_argument_container(container, key, context):
         its = []
-        for infered in container.infer(context=context):
-            if infered is util.YES:
+        for inferred in container.infer(context=context):
+            if inferred is util.YES:
                 its.append((util.YES,))
                 continue
             try:
-                its.append(infered.getitem(key, context).infer(context=context))
+                its.append(inferred.getitem(key, context).infer(context=context))
             except (exceptions.InferenceError, AttributeError):
                 its.append((util.YES,))
             except (IndexError, TypeError):
diff --git a/astroid/inference.py b/astroid/inference.py
index 05cbe5eb..62894a21 100644
--- a/astroid/inference.py
+++ b/astroid/inference.py
@@ -90,7 +90,7 @@ nodes.Name._infer = bases.path_wrapper(infer_name)
 nodes.AssignName.infer_lhs = infer_name # won't work with a path wrapper
 
 
-@bases.raise_if_nothing_infered
+@bases.raise_if_nothing_inferred
 @bases.path_wrapper
 def infer_callfunc(self, context=None):
     """infer a CallFunc node by trying to guess what the function returns"""
@@ -153,7 +153,7 @@ def infer_from(self, context=None, asname=True):
 nodes.ImportFrom._infer = infer_from
 
 
-@bases.raise_if_nothing_infered
+@bases.raise_if_nothing_inferred
 def infer_getattr(self, context=None):
     """infer a Getattr node by using getattr on the associated object"""
     for owner in self.expr.infer(context):
@@ -217,7 +217,7 @@ def infer_subscript(self, context=None):
     else:
         raise exceptions.InferenceError()
 nodes.Subscript._infer = bases.path_wrapper(infer_subscript)
-nodes.Subscript.infer_lhs = bases.raise_if_nothing_infered(infer_subscript)
+nodes.Subscript.infer_lhs = bases.raise_if_nothing_inferred(infer_subscript)
 
 
 @bases.raise_if_nothing_inferred
@@ -622,7 +622,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 exceptions.AstroidError:
             yield util.YES
diff --git a/astroid/node_classes.py b/astroid/node_classes.py
index 1c25fac1..f22a78c9 100644
--- a/astroid/node_classes.py
+++ b/astroid/node_classes.py
@@ -457,7 +457,7 @@ class Assert(bases.Statement):
         self.test = test
 
 
-class Assign(mixins.Statement, bases.AssignTypeMixin):
+class Assign(bases.Statement, mixins.AssignTypeMixin):
     """class representing an Assign node"""
     _astroid_fields = ('targets', 'value',)
     targets = None
@@ -837,18 +837,11 @@ class ExtSlice(bases.NodeNG):
     _astroid_fields = ('dims',)
     dims = None
 
-<<<<<<< variant A
     def postinit(self, dims=None):
         self.dims = dims
 
 
-class For(BlockRangeMixIn, AssignTypeMixin, Statement):
->>>>>>> variant B
-
 class For(mixins.BlockRangeMixIn, mixins.AssignTypeMixin, bases.Statement):
-####### Ancestor
-class For(BlockRangeMixIn, AssignTypeMixin, Statement):
-======= end
     """class representing a For node"""
     _astroid_fields = ('target', 'iter', 'body', 'orelse',)
     target = None
diff --git a/astroid/objects.py b/astroid/objects.py
index a78dcb41..056e2d24 100644
--- a/astroid/objects.py
+++ b/astroid/objects.py
@@ -53,15 +53,9 @@ class FrozenSet(bases.NodeNG, bases.Instance, mixins.ParentAssignTypeMixin):
         if elts is None:
             node.elts = []
         else:
-            node.elts = [const_factory(e) for e in elts]
+            node.elts = [node_classes.const_factory(e) for e in elts]
         return node
 
-    def __init__(self, elts=None):
-        if elts is None:
-            self.elts = []
-        else:
-            self.elts = [node_classes.const_factory(e) for e in elts]
-
     def pytype(self):
         return '%s.frozenset' % BUILTINS
 
@@ -117,8 +111,8 @@ class Super(bases.NodeNG):
 
             if isinstance(self.type, scoped_nodes.ClassDef):
             # `super(type, type)`, most likely in a class method.
-            self._class_based = True
-            mro_type = self.type
+                self._class_based = True
+                mro_type = self.type
         else:
             mro_type = getattr(self.type, '_proxied', None)
             if not isinstance(mro_type, (bases.Instance, scoped_nodes.ClassDef)):
diff --git a/astroid/protocols.py b/astroid/protocols.py
index 72f78984..071b3970 100644
--- a/astroid/protocols.py
+++ b/astroid/protocols.py
@@ -455,13 +455,7 @@ def with_assigned_stmts(self, node, context=None, asspath=None):
             yield obj
 
 
-<<<<<<< variant A
-nodes.With.assigned_stmts = raise_if_nothing_inferred(with_assigned_stmts)
->>>>>>> variant B
 nodes.With.assigned_stmts = with_assigned_stmts
-####### Ancestor
-nodes.With.assigned_stmts = raise_if_nothing_infered(with_assigned_stmts)
-======= end
 
 
 @bases.yes_if_nothing_inferred
diff --git a/astroid/raw_building.py b/astroid/raw_building.py
index ce80b0e2..aa07791b 100644
--- a/astroid/raw_building.py
+++ b/astroid/raw_building.py
@@ -94,7 +94,7 @@ def build_module(name, doc=None):
 
 def build_class(name, basenames=(), doc=None):
     """create and initialize a astroid ClassDef node"""
-    node = ClassDef(name, doc)
+    node = nodes.ClassDef(name, doc)
     for base in basenames:
         basenode = nodes.Name()
         basenode.name = base
diff --git a/astroid/rebuilder.py b/astroid/rebuilder.py
index 6399ef01..413e6c93 100644
--- a/astroid/rebuilder.py
+++ b/astroid/rebuilder.py
@@ -108,7 +108,7 @@ class TreeRebuilder(object):
         newnode = nodes.Module(name=modname, doc=doc, file=modpath, path=modpath,
                                package=package, parent=None)
         newnode.postinit([self.visit(child, newnode) for child in node.body])
-        return self._transform(newnode)
+        return newnode
 
     def visit(self, node, parent, assign_ctx=None):
         cls = node.__class__
diff --git a/astroid/scoped_nodes.py b/astroid/scoped_nodes.py
index fbe58759..1ac925fd 100644
--- a/astroid/scoped_nodes.py
+++ b/astroid/scoped_nodes.py
@@ -1063,7 +1063,7 @@ def get_wrapping_class(node):
 
 
 
-class Class(bases.Statement, LocalsDictNodeNG, mixins.FilterStmtsMixin):
+class ClassDef(bases.Statement, LocalsDictNodeNG, mixins.FilterStmtsMixin):
 
     # some of the attributes below are set by the builder module or
     # by a raw factories
@@ -1554,13 +1554,7 @@ class Class(bases.Statement, LocalsDictNodeNG, mixins.FilterStmtsMixin):
             inferred = next(assignment.infer())
         except exceptions.InferenceError:
             return
-<<<<<<< variant A
-        if inferred is bases.YES: # don't expose this
->>>>>>> variant B
-        if infered is util.YES: # don't expose this
-####### Ancestor
-        if infered is bases.YES: # don't expose this
-======= end
+        if inferred is util.YES: # don't expose this
             return None
         return inferred
 
diff --git a/astroid/tests/unittest_inference.py b/astroid/tests/unittest_inference.py
index 5fb85430..dd3cd91b 100644
--- a/astroid/tests/unittest_inference.py
+++ b/astroid/tests/unittest_inference.py
@@ -988,28 +988,12 @@ class InferenceTest(resources.SysPathSetup, unittest.TestCase):
     def test_binary_op_list_mul_none(self):
         'test correct handling on list multiplied by None'
         ast = builder.string_build('a = [1] * None\nb = [1] * "r"')
-<<<<<<< variant A
         inferred = ast['a'].inferred()
         self.assertEqual(len(inferred), 1)
-        self.assertEqual(inferred[0], YES)
+        self.assertEqual(inferred[0], util.YES)
         inferred = ast['b'].inferred()
         self.assertEqual(len(inferred), 1)
-        self.assertEqual(inferred[0], YES)
->>>>>>> variant B
-        infered = ast['a'].infered()
-        self.assertEqual(len(infered), 1)
-        self.assertEqual(infered[0], util.YES)
-        infered = ast['b'].infered()
-        self.assertEqual(len(infered), 1)
-        self.assertEqual(infered[0], util.YES)
-####### Ancestor
-        infered = ast['a'].infered()
-        self.assertEqual(len(infered), 1)
-        self.assertEqual(infered[0], YES)
-        infered = ast['b'].infered()
-        self.assertEqual(len(infered), 1)
-        self.assertEqual(infered[0], YES)
-======= end
+        self.assertEqual(inferred[0], util.YES)
 
     def test_binary_op_tuple_add(self):
         ast = builder.string_build('a = (1,) + (2,)', __name__, __file__)
diff --git a/astroid/tests/unittest_nodes.py b/astroid/tests/unittest_nodes.py
index 511a8c77..2a13556b 100644
--- a/astroid/tests/unittest_nodes.py
+++ b/astroid/tests/unittest_nodes.py
@@ -315,14 +315,14 @@ class ImportNodeTest(resources.SysPathSetup, unittest.TestCase):
         self.assertEqual(abspath.pytype(), '%s.function' % BUILTINS)
 
     def test_real_name(self):
-        from_ = self.module['pb']
-        self.assertEqual(from_.real_name('pb'), 'ProgressBar')
+        from_ = self.module['NameNode']
+        self.assertEqual(from_.real_name('NameNode'), 'Name')
         imp_ = self.module['os']
         self.assertEqual(imp_.real_name('os'), 'os')
         self.assertRaises(exceptions.NotFoundError, imp_.real_name, 'os.path')
-        imp_ = self.module['pb']
-        self.assertEqual(imp_.real_name('pb'), 'ProgressBar')
-        self.assertRaises(exceptions.NotFoundError, imp_.real_name, 'ProgressBar')
+        imp_ = self.module['NameNode']
+        self.assertEqual(imp_.real_name('NameNode'), 'Name')
+        self.assertRaises(exceptions.NotFoundError, imp_.real_name, 'Name')
         imp_ = self.module2['YO']
         self.assertEqual(imp_.real_name('YO'), 'YO')
         self.assertRaises(exceptions.NotFoundError, imp_.real_name, 'data')
@@ -330,8 +330,8 @@ class ImportNodeTest(resources.SysPathSetup, unittest.TestCase):
     def test_as_string(self):
         ast = self.module['modutils']
         self.assertEqual(ast.as_string(), "from astroid import modutils")
-        ast = self.module['pb']
-        self.assertEqual(ast.as_string(), "from logilab.common.shellutils import ProgressBar as pb")
+        ast = self.module['NameNode']
+        self.assertEqual(ast.as_string(), "from astroid.node_classes import Name as NameNode")
         ast = self.module['os']
         self.assertEqual(ast.as_string(), "import os.path")
         code = """from . import here
diff --git a/tox.ini b/tox.ini
index 466a6fa3..a1b7930b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,8 +1,8 @@
 [tox]
 # official list is
 # envlist = py27, py33, py34, pypy, jython
-# envlist = py27, py34, pylint
-envlist = py27, py33
+envlist = py27, py34, pylint
+# envlist = py27, py33
 
 [testenv:pylint]
 deps =