Merge pull request #204 from PyCQA/201-fix-compat

Fix compatability with latest releases of astroid/pylint

Author: carlio

.travis.yml

@@ -27,6 +27,7 @@ matrix:
 
 install:
   - pip install tox-travis
+  - pip install -e .[for_tests]
 script:
   - |
         if [ -z "$SANITY_CHECK" ]; then

CHANGELOG.rst

@@ -1,6 +1,12 @@
 Changelog
 =========
 
+Version 2.0.3 (26 Nov 2018)
+---------------------------
+
+- Fixing compatability between ranges of astroid (2.0.4 -> 2.1) and pylint (2.1.1 -> 2.2)
+  `#201 <https://github.com/PyCQA/pylint-django/issues/201>` and `#202 <https://github.com/PyCQA/pylint-django/issues/202>`
+
 Version 2.0.2 (26 Aug 2018)
 ---------------------------
 

pylint_django/augmentations/__init__.py

@@ -745,6 +745,14 @@ def is_wsgi_application(node):
         (frame.name == 'wsgi' or frame.path[0].endswith('wsgi.py') or frame.file.endswith('wsgi.py'))
 
 
+# Compat helpers
+def pylint_newstyle_classdef_compat(linter, warning_name, augment):
+    if not hasattr(NewStyleConflictChecker, 'visit_classdef'):
+        return
+    suppress_message(linter, getattr(NewStyleConflictChecker, 'visit_classdef'), warning_name, augment)
+
+
+# augment things
 def apply_augmentations(linter):
     """Apply augmentation and suppression rules."""
     augment_visit(linter, TypeChecker.visit_attribute, foreign_key_sets)
@@ -787,15 +795,15 @@ def apply_augmentations(linter):
 
     # Meta
     suppress_message(linter, DocStringChecker.visit_classdef, 'missing-docstring', is_model_meta_subclass)
-    suppress_message(linter, NewStyleConflictChecker.visit_classdef, 'old-style-class', is_model_meta_subclass)
+    pylint_newstyle_classdef_compat(linter, 'old-style-class', is_model_meta_subclass)
     suppress_message(linter, ClassChecker.visit_classdef, 'no-init', is_model_meta_subclass)
     suppress_message(linter, MisdesignChecker.leave_classdef, 'too-few-public-methods', is_model_meta_subclass)
     suppress_message(linter, ClassChecker.visit_attribute, 'protected-access', allow_meta_protected_access)
 
     # Media
     suppress_message(linter, NameChecker.visit_assignname, 'C0103', is_model_media_valid_attributes)
     suppress_message(linter, DocStringChecker.visit_classdef, 'missing-docstring', is_model_media_subclass)
-    suppress_message(linter, NewStyleConflictChecker.visit_classdef, 'old-style-class', is_model_media_subclass)
+    pylint_newstyle_classdef_compat(linter, 'old-style-class', is_model_media_subclass)
     suppress_message(linter, ClassChecker.visit_classdef, 'no-init', is_model_media_subclass)
     suppress_message(linter, MisdesignChecker.leave_classdef, 'too-few-public-methods', is_model_media_subclass)
 
@@ -823,7 +831,7 @@ def apply_augmentations(linter):
 
     # django-mptt
     suppress_message(linter, DocStringChecker.visit_classdef, 'missing-docstring', is_model_mpttmeta_subclass)
-    suppress_message(linter, NewStyleConflictChecker.visit_classdef, 'old-style-class', is_model_mpttmeta_subclass)
+    pylint_newstyle_classdef_compat(linter, 'old-style-class', is_model_mpttmeta_subclass)
     suppress_message(linter, ClassChecker.visit_classdef, 'W0232', is_model_mpttmeta_subclass)
     suppress_message(linter, MisdesignChecker.leave_classdef, 'too-few-public-methods', is_model_mpttmeta_subclass)
 

pylint_django/checkers/forms.py

@@ -13,6 +13,7 @@ def _get_child_meta(node):
     for child in node.get_children():
         if isinstance(child, ClassDef) and child.name == 'Meta':
             return child
+    return None
 
 
 class FormChecker(BaseChecker):

pylint_django/checkers/json_response.py

@@ -8,8 +8,7 @@
 
 import astroid
 
-from pylint import interfaces
-from pylint import checkers
+from pylint import interfaces, checkers
 from pylint.checkers import utils
 from pylint_django.__pkginfo__ import BASE_ID
 

pylint_django/compat.py

@@ -0,0 +1,43 @@
+# flake8: noqa
+# pylint: skip-file
+# no sane linter can figure out the hackiness in this compatability layer...
+
+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/tests/input/func_noerror_test_wsgi_request.py

@@ -9,7 +9,6 @@
 
 class SomeModel(models.Model):
     """Just a model."""
-    pass
 
 
 class SomeTestCase(TestCase):

pylint_django/transforms/transforms/django_db_models_fields_files.py

@@ -1,3 +1,4 @@
+# pylint: disable=super-init-not-called
 from django.db.models.fields import files as django_fields
 
 

pylint_django/transforms/transforms/django_utils_translation.py

@@ -1,2 +1,2 @@
-def ugettext_lazy(x):
+def ugettext_lazy(_):
     return ''

pylint_django/utils.py

@@ -1,11 +1,11 @@
 """Utils."""
 import sys
 
-from astroid.util import YES
 from astroid.bases import Instance
-from astroid.nodes import ClassDef
 from astroid.exceptions import InferenceError
+from astroid.nodes import ClassDef
 
+from pylint_django.compat import Uninferable
 
 PY3 = sys.version_info >= (3, 0)
 
@@ -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:

setup.py

@@ -13,7 +13,7 @@
     author_email='code@landscape.io',
     description='A Pylint plugin to help Pylint understand the Django web framework',
     long_description=LONG_DESCRIPTION,
-    version='2.0.2',
+    version='2.0.3',
     packages=find_packages(),
     include_package_data=True,
     install_requires=[
@@ -22,6 +22,7 @@
     ],
     extras_require={
         'with_django': ['Django'],
+        'for_tests': ['django_tables2', 'factory-boy'],
     },
     license='GPLv2',
     classifiers=[

tox.ini

@@ -16,7 +16,7 @@ commands =
     django_not_installed: bash -c \'pylint --load-plugins=pylint_django setup.py | grep django-not-available\'
     django_is_installed: pylint --load-plugins=pylint_django setup.py
     flake8: flake8
-    pylint: pylint --rcfile=tox.ini -d missing-docstring --ignore=tests pylint_django setup
+    pylint: pylint --rcfile=tox.ini -d missing-docstring,too-many-branches,too-many-return-statements,too-many-ancestors,fixme --ignore=tests pylint_django setup
     readme: python setup.py check --restructuredtext --strict
     py{36}-django{111,20}: coverage run pylint_django/tests/test_func.py -v
     py{35,36,37}-django21: coverage run pylint_django/tests/test_func.py -v