Skip to content

Commit d8362a3

Browse files
Remove the compat layer for 'only_required_for_messages'
The clearer name for this function is the current name.
1 parent 64279cb commit d8362a3

File tree

8 files changed

+17
-23
lines changed

8 files changed

+17
-23
lines changed

pylint_django/checkers/auth_user.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from pylint import checkers
2+
from pylint.checkers.utils import only_required_for_messages
23

34
from pylint_django.__pkginfo__ import BASE_ID
4-
from pylint_django.compat import check_messages
55

66

77
class AuthUserChecker(checkers.BaseChecker):
@@ -20,14 +20,14 @@ class AuthUserChecker(checkers.BaseChecker):
2020
),
2121
}
2222

23-
@check_messages("hard-coded-auth-user")
23+
@only_required_for_messages("hard-coded-auth-user")
2424
def visit_const(self, node):
2525
# for now we don't check if the parent is a ForeignKey field
2626
# because the user model should not be hard-coded anywhere
2727
if node.value == "auth.User":
2828
self.add_message("hard-coded-auth-user", node=node)
2929

30-
@check_messages("imported-auth-user")
30+
@only_required_for_messages("imported-auth-user")
3131
def visit_importfrom(self, node):
3232
if node.modname == "django.contrib.auth.models":
3333
for imported_names in node.names:

pylint_django/checkers/django_installed.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
from pylint.checkers import BaseChecker
2+
from pylint.checkers.utils import only_required_for_messages
23

34
from pylint_django.__pkginfo__ import BASE_ID
4-
from pylint_django.compat import check_messages
55

66

77
class DjangoInstalledChecker(BaseChecker):
@@ -23,7 +23,7 @@ class DjangoInstalledChecker(BaseChecker):
2323
),
2424
}
2525

26-
@check_messages("django-not-available")
26+
@only_required_for_messages("django-not-available")
2727
def open(self):
2828
try:
2929
__import__("django")

pylint_django/checkers/foreign_key_strings.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import astroid
22
from pylint.checkers import BaseChecker
3+
from pylint.checkers.utils import only_required_for_messages
34

45
from pylint_django.__pkginfo__ import BASE_ID
5-
from pylint_django.compat import check_messages
66
from pylint_django.transforms import foreignkey
77

88

@@ -133,7 +133,7 @@ def open(self):
133133
# duplicating the django_installed checker, it'll do for now. In the future, merging
134134
# those two checkers together might make sense.
135135

136-
@check_messages("django-not-configured")
136+
@only_required_for_messages("django-not-configured")
137137
def visit_module(self, node):
138138
if self._raise_warning:
139139
# just add it to the first node we see... which isn't nice but not sure what else to do

pylint_django/checkers/forms.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
from astroid.nodes import Assign, AssignName, ClassDef
44
from pylint.checkers import BaseChecker
5+
from pylint.checkers.utils import only_required_for_messages
56

67
from pylint_django.__pkginfo__ import BASE_ID
7-
from pylint_django.compat import check_messages
88
from pylint_django.utils import node_is_subclass
99

1010

@@ -27,7 +27,7 @@ class FormChecker(BaseChecker):
2727
)
2828
}
2929

30-
@check_messages("modelform-uses-exclude")
30+
@only_required_for_messages("modelform-uses-exclude")
3131
def visit_classdef(self, node):
3232
"""Class visitor."""
3333
if not node_is_subclass(node, "django.forms.models.ModelForm", ".ModelForm"):

pylint_django/checkers/json_response.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88

99
import astroid
1010
from pylint import checkers
11+
from pylint.checkers.utils import only_required_for_messages
1112

1213
from pylint_django.__pkginfo__ import BASE_ID
13-
from pylint_django.compat import check_messages
1414

1515

1616
class JsonResponseChecker(checkers.BaseChecker):
@@ -41,7 +41,7 @@ class JsonResponseChecker(checkers.BaseChecker):
4141
),
4242
}
4343

44-
@check_messages(
44+
@only_required_for_messages(
4545
"http-response-with-json-dumps",
4646
"http-response-with-content-type-json",
4747
"redundant-content-type-for-json-response",

pylint_django/checkers/migrations.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010

1111
import astroid
1212
from pylint import checkers
13+
from pylint.checkers.utils import only_required_for_messages
1314
from pylint_plugin_utils import suppress_message
1415

1516
from pylint_django import compat
1617
from pylint_django.__pkginfo__ import BASE_ID
17-
from pylint_django.compat import check_messages
1818
from pylint_django.utils import is_migrations_module
1919

2020

@@ -84,7 +84,7 @@ def visit_call(self, node):
8484
if node not in self._possible_offences[module]:
8585
self._possible_offences[module].append(node)
8686

87-
@check_messages("new-db-field-with-default")
87+
@only_required_for_messages("new-db-field-with-default")
8888
def close(self):
8989
def _path(node):
9090
return node.path
@@ -121,7 +121,7 @@ class MissingBackwardsMigrationChecker(checkers.BaseChecker):
121121
)
122122
}
123123

124-
@check_messages("missing-backwards-migration-callable")
124+
@only_required_for_messages("missing-backwards-migration-callable")
125125
def visit_call(self, node):
126126
try:
127127
module = node.frame().parent

pylint_django/checkers/models.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
"""Models."""
22

3-
from astroid import Const
4-
from astroid.nodes import Assign, AssignName, ClassDef, FunctionDef
3+
from astroid.nodes import Assign, AssignName, ClassDef, Const, FunctionDef
54
from pylint.checkers import BaseChecker
5+
from pylint.checkers.utils import only_required_for_messages
66

77
from pylint_django.__pkginfo__ import BASE_ID
8-
from pylint_django.compat import check_messages
98
from pylint_django.utils import PY3, node_is_subclass
109

1110
MESSAGES = {
@@ -78,7 +77,7 @@ class ModelChecker(BaseChecker):
7877
name = "django-model-checker"
7978
msgs = MESSAGES
8079

81-
@check_messages("model-missing-unicode")
80+
@only_required_for_messages("model-missing-unicode")
8281
def visit_classdef(self, node): # noqa: PLR0911
8382
"""Class visitor."""
8483
if not node_is_subclass(node, "django.db.models.base.Model", ".Model"):

pylint_django/compat.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,6 @@
2121
except ImportError:
2222
from astroid.util import Uninferable
2323

24-
try:
25-
from pylint.checkers.utils import only_required_for_messages as check_messages
26-
except (ImportError, ModuleNotFoundError):
27-
from pylint.checkers.utils import check_messages
28-
2924
import pylint
3025

3126
# pylint before version 2.3 does not support load_configuration() hook.

0 commit comments

Comments
 (0)