Merge pull request #344 from PyCQA/343-astroid-2.9.1-compat

Astroid 2.9.1 scoped_nodes compatibility fix
pylint-dev · Jan 2, 2022 · 8bab55e · 8bab55e
2 parents fb85b71 + 9811df2
commit 8bab55e
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -3,10 +3,19 @@ Changelog
 
 Version 2.5 [WIP]
 ---------------------------
+
+Bugfixes
+~~~~~~~~
+
+- Fixed compatability with astroid 2.9.1 (`#343 <https://github.com/PyCQA/pylint-django/issues/343>`_)
+
+New
+~~~
+
 - Moved from Travis CI to GitHub Actions (`#366 <https://github.com/PyCQA/pylint-django/pull/366>`_ and `#340 <https://github.com/PyCQA/pylint-django/pull/340>`_)
-- Added pre-commit configuration and began enforcing black/isort code formatting (TODO: add github action to enforce)
+- Added pre-commit configuration and began enforcing black/isort code formatting
 - Multiple test fixes (including `#338 <https://github.com/PyCQA/pylint-django/issues/338>`_) - newer versions of pylint expect a different format for the expected messages txt files.
-- TODO: Bumped dependency for pylint-django-utils to get `multi-threaded pylint support <https://github.com/PyCQA/pylint-plugin-utils/pull/21>`_
+- Bumped dependency for pylint-django-utils to get `multi-threaded pylint support <https://github.com/PyCQA/pylint-plugin-utils/pull/21>`_
 
 Version 2.4.4 (26 Apr 2021)
 ---------------------------

diff --git a/pylint_django/augmentations/__init__.py b/pylint_django/augmentations/__init__.py
@@ -5,9 +5,9 @@
 
 from astroid import InferenceError
 from astroid.nodes import Attribute, ClassDef, ImportFrom
+from astroid.nodes.scoped_nodes import ClassDef as ScopedClass
+from astroid.nodes.scoped_nodes import Module
 from astroid.objects import Super
-from astroid.scoped_nodes import ClassDef as ScopedClass
-from astroid.scoped_nodes import Module
 from django import VERSION as django_version
 from django.utils import termcolors
 from django.views.generic.base import ContextMixin, RedirectView, View

diff --git a/pylint_django/transforms/fields.py b/pylint_django/transforms/fields.py
@@ -1,4 +1,5 @@
-from astroid import MANAGER, AstroidImportError, inference_tip, nodes, scoped_nodes
+from astroid import MANAGER, AstroidImportError, inference_tip, nodes
+from astroid.nodes import scoped_nodes
 
 from pylint_django import utils