From 160eda53e110871e6e7c1bd4c16ecb88b78083e7 Mon Sep 17 00:00:00 2001 From: Clinton Blackburn Date: Sun, 25 Nov 2018 11:41:49 -0800 Subject: [PATCH 1/2] Fixed call to astroid.util.YES YES has been replaced with Uninferable. YES has been an alias to Uninferable for some time, and was recently removed. Closes #201 --- pylint_django/utils.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pylint_django/utils.py b/pylint_django/utils.py index ac1774db..27072251 100644 --- a/pylint_django/utils.py +++ b/pylint_django/utils.py @@ -1,7 +1,7 @@ """Utils.""" import sys -from astroid.util import YES +from astroid.util 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: From e87908e29c96197caac4039144c9f751d40b828a Mon Sep 17 00:00:00 2001 From: Clinton Blackburn Date: Sun, 25 Nov 2018 11:45:53 -0800 Subject: [PATCH 2/2] Added clintonb to contributors --- CONTRIBUTORS.md | 2 ++ README.rst | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index 8c089b59..677655fa 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -9,3 +9,5 @@ * [atodorov](https://github.com/atodorov) * [bittner](https://github.com/bittner) * [federicobond](https://github.com/federicobond) +* [clintonb](https://github.com/clintonb) + diff --git a/README.rst b/README.rst index 690ae2f8..33e584a0 100644 --- a/README.rst +++ b/README.rst @@ -103,7 +103,7 @@ If it's just done for convenience that's really up to you the developer to fix. Contributing ------------ -Please feel free to add your name to the ``CONTRIBUTORS.rst`` file if you want to +Please feel free to add your name to the ``CONTRIBUTORS.md`` file if you want to be credited when pull requests get merged. You can also add to the ``CHANGELOG.rst`` file if you wish, although we'll also do that when merging.