[refs #201] Adding compat layer back in, and fixing compatability between astroid 2.04 and 2.1wq

Author: carlio

pylint_django/compat.py

@@ -0,0 +1,39 @@
+try:
+    from astroid.nodes import ClassDef, FunctionDef, ImportFrom, AssignName, Attribute
+except ImportError:
+    from astroid.nodes import (
+        Class as ClassDef,
+        Function as FunctionDef,
+        From as ImportFrom,
+        AssName as AssignName,
+        Getattr as Attribute,
+    )
+
+try:
+    from astroid.bases import YES as Uninferable
+except ImportError:
+    try:
+        from astroid.util import YES as Uninferable
+    except ImportError:
+        from astroid.util import Uninferable
+
+try:
+    django = __import__("django")
+    django_version = django.VERSION
+except ImportError:
+    # if not available, will be handled by the django_installed checker
+    django_version = (1, 5)
+
+
+def inferred(node):
+    if hasattr(node, "inferred"):
+        return node.inferred
+    else:
+        return node.infered
+
+
+def instantiate_class(node):
+    if hasattr(node, "instantiate_class"):
+        return node.instantiate_class
+    else:
+        return node.instanciate_class

pylint_django/utils.py

@@ -1,7 +1,7 @@
 """Utils."""
 import sys
 
-from astroid.util import YES
+from pylint_django.compat import Uninferable
 from astroid.bases import Instance
 from astroid.nodes import ClassDef
 from astroid.exceptions import InferenceError
@@ -15,7 +15,7 @@ def node_is_subclass(cls, *subclass_names):
     if not isinstance(cls, (ClassDef, Instance)):
         return False
 
-    if cls.bases == YES:
+    if cls.bases == Uninferable:
         return False
     for base_cls in cls.bases:
         try: