Move proxies to nodes.py and scoped_nodes.py

3 files changed, 27 insertions, 28 deletions

diff --git a/astroid/node_classes.py b/astroid/node_classes.py
index e341b38e..85f57dc9 100644
--- a/astroid/node_classes.py
+++ b/astroid/node_classes.py
@@ -18,7 +18,9 @@
 """Module for some node classes. More nodes in scoped_nodes.py
 """
 
+import lazy_object_proxy
 import six
+
 from logilab.common.decorators import cachedproperty
 
 from astroid.exceptions import (
@@ -1330,3 +1332,18 @@ def const_factory(value):
         node = EmptyNode()
         node.object = value
         return node
+
+
+# Backward-compatibility aliases
+def proxy_alias(alias_name, node_type):
+    proxy = type(alias_name, (lazy_object_proxy.Proxy,),
+                 {'__class__': object.__dict__['__class__']})
+    return proxy(lambda: node_type)
+
+Backquote = proxy_alias('Backquote', Repr)
+Discard = proxy_alias('Discard', Expr)
+AssName = proxy_alias('AssName', AssignName)
+AssAttr = proxy_alias('AssAttr', AssignAttr)
+Getattr = proxy_alias('Getattr', Attribute)
+CallFunc = proxy_alias('CallFunc', Call)
+From = proxy_alias('From', ImportFrom)
diff --git a/astroid/nodes.py b/astroid/nodes.py
index 07fe8594..820a8d49 100644
--- a/astroid/nodes.py
+++ b/astroid/nodes.py
@@ -38,8 +38,6 @@ on ImportFrom and Import :
 
 __docformat__ = "restructuredtext en"
 
-import lazy_object_proxy
-
 from astroid.node_classes import (
     Arguments, AssignAttr, Assert, Assign,
     AssignName, AugAssign, Repr, BinOp, BoolOp, Break, Call, Compare,
@@ -48,14 +46,19 @@ from astroid.node_classes import (
     ImportFrom, Attribute, Global, If, IfExp, Import, Index, Keyword,
     List, Name, Nonlocal, Pass, Print, Raise, Return, Set, Slice, Starred, Subscript,
     TryExcept, TryFinally, Tuple, UnaryOp, While, With, Yield, YieldFrom,
-    const_factory
+    const_factory,
+    # Backwards-compatibility aliases
+    Backquote, Discard, AssName, AssAttr, Getattr, CallFunc, From
 )
 from astroid.scoped_nodes import (
     Module, GeneratorExp, Lambda, DictComp,
     ListComp, SetComp, FunctionDef, ClassDef,
+    # Backwards-compatibility aliases
+    Class, Function, GenExpr,
 )
 
 
+
 ALL_NODE_CLASSES = (
     Arguments, AssignAttr, Assert, Assign, AssignName, AugAssign,
     Repr, BinOp, BoolOp, Break,
@@ -78,21 +81,3 @@ ALL_NODE_CLASSES = (
     While, With,
     Yield, YieldFrom
     )
-
-
-# Backward-compatibility aliases
-def proxy_alias(alias_name, node_type):
-    proxy = type(alias_name, (lazy_object_proxy.Proxy,),
-                 {'__class__': object.__dict__['__class__']})
-    return proxy(lambda: node_type)
-
-Backquote = proxy_alias('Backquote', Repr)
-Discard = proxy_alias('Discard', Expr)
-AssName = proxy_alias('AssName', AssignName)
-AssAttr = proxy_alias('AssAttr', AssignAttr)
-Getattr = proxy_alias('Getattr', Attribute)
-CallFunc = proxy_alias('CallFunc', Call)
-Class = proxy_alias('Class', ClassDef)
-Function = proxy_alias('Function', FunctionDef)
-GenExpr = proxy_alias('GenExpr', GeneratorExp)
-From = proxy_alias('From', ImportFrom)
diff --git a/astroid/scoped_nodes.py b/astroid/scoped_nodes.py
index 2e9d389a..8d053c8f 100644
--- a/astroid/scoped_nodes.py
+++ b/astroid/scoped_nodes.py
@@ -1621,10 +1621,7 @@ class ClassDef(bases.Statement, LocalsDictNodeNG, mixins.FilterStmtsMixin):
         return True
 
 
-# Hack to get Pylint working without changing code.
-import lazy_object_proxy
-def proxy_alias(alias_name, node_type):
-    proxy = type(alias_name, (lazy_object_proxy.Proxy,),
-                 {'__class__': object.__dict__['__class__']})
-    return proxy(lambda: node_type)
-GenExpr = proxy_alias('GenExpr', GeneratorExp)
+# Backwards-compatibility aliases
+Class = node_classes.proxy_alias('Class', ClassDef)
+Function = node_classes.proxy_alias('Function', FunctionDef)
+GenExpr = node_classes.proxy_alias('GenExpr', GeneratorExp)