fix From node __init__

--HG--
branch : rebuild

3 files changed, 9 insertions, 11 deletions

diff --git a/node_classes.py b/node_classes.py
index ef42194c..e4d192ed 100644
--- a/node_classes.py
+++ b/node_classes.py
@@ -377,6 +377,9 @@ class FromImportMixIn(BaseClass):
 class From(FromImportMixIn, StmtMixIn, NodeNG):
     """class representing a From node"""
 
+    def __init__(self,  fromname, names):
+        self.fromname = fromname
+        self.names = names
 
 class Getattr(NodeNG):
     """class representing a Getattr node"""
diff --git a/raw_building.py b/raw_building.py
index 2129db44..d9bf31c6 100644
--- a/raw_building.py
+++ b/raw_building.py
@@ -55,10 +55,8 @@ def attach_import_node(node, modname, membername):
     """create a From node and register it in the locals of the given
     node with the specified name
     """
-    from_node = nodes.From()
+    from_node = nodes.From(modname, [(membername, None)])
     from_node.level = 0
-    from_node.modname = modname
-    from_node.names = [(membername, None)]
     _attach_local_node(node, from_node, membername)
 
 
@@ -126,14 +124,10 @@ def build_function(name, args=None, defaults=None, flag=0, doc=None):
 #     return nodes.Assign([nodes.AssAttr(nodes.Name(attr), name, 'OP_ASSIGN')],
 #                         nodes.Const(value))
 
-if sys.version_info < (2, 5):
-    def build_from_import(fromname, names):
-        """create and initialize an astng From import statement"""
-        return nodes.From(fromname, [(name, None) for name in names])
-else:
-    def build_from_import(fromname, names):
-        """create and initialize an astng From import statement"""
-        return nodes.From(fromname, [(name, None) for name in names], 0)
+
+def build_from_import(fromname, names):
+    """create and initialize an astng From import statement"""
+    return nodes.From(fromname, [(name, None) for name in names])
 
 def register_arguments(func, args=None):
     """add given arguments to local
diff --git a/rebuilder.py b/rebuilder.py
index 0232266e..aaaf033e 100644
--- a/rebuilder.py
+++ b/rebuilder.py
@@ -314,3 +314,4 @@ class RebuildVisitor(ASTVisitor):
                     values.append(node)
         except InferenceError:
             pass
+