summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorClaudiu Popa <pcmanticore@gmail.com>2019-10-16 12:00:29 +0200
committerClaudiu Popa <pcmanticore@gmail.com>2019-10-16 12:00:29 +0200
commit273412fba6b83acd524c265228638abde6411a4c (patch)
tree60fd505a0ff7658105bc474faeb98d7189b56b70
parent32aad0073a7cb255039c18f56ffcba1c37551c0b (diff)
downloadpylint-git-273412fba6b83acd524c265228638abde6411a4c.tar.gz
Squash is_property_deleter and use is_property_setter_or_deleter instead
-rw-r--r--pylint/checkers/base.py6
-rw-r--r--pylint/checkers/utils.py5
2 files changed, 3 insertions, 8 deletions
diff --git a/pylint/checkers/base.py b/pylint/checkers/base.py
index bea58016d..c94676e7d 100644
--- a/pylint/checkers/base.py
+++ b/pylint/checkers/base.py
@@ -52,7 +52,7 @@ from astroid.arguments import CallSite
import pylint.utils as lint_utils
from pylint import checkers, exceptions, interfaces
from pylint.checkers import utils
-from pylint.checkers.utils import is_property_deleter, is_property_setter
+from pylint.checkers.utils import is_property_setter_or_deleter
from pylint.reporters.ureports import nodes as reporter_nodes
@@ -316,7 +316,7 @@ def _determine_function_name_type(node, config=None):
if not node.is_method():
return "function"
- if is_property_setter(node) or is_property_deleter(node):
+ if is_property_setter_or_deleter(node):
# If the function is decorated using the prop_method.{setter,getter}
# form, treat it like an attribute as well.
return "attr"
@@ -2013,7 +2013,7 @@ class DocStringChecker(_BasicChecker):
def visit_functiondef(self, node):
if self.config.no_docstring_rgx.match(node.name) is None:
ftype = "method" if node.is_method() else "function"
- if is_property_setter(node) or is_property_deleter(node):
+ if is_property_setter_or_deleter(node):
return
if isinstance(node.parent.frame(), astroid.ClassDef):
diff --git a/pylint/checkers/utils.py b/pylint/checkers/utils.py
index 22c44836a..87fed09f9 100644
--- a/pylint/checkers/utils.py
+++ b/pylint/checkers/utils.py
@@ -731,11 +731,6 @@ def is_property_setter(node: astroid.FunctionDef) -> bool:
return _is_property_kind(node, "setter")
-def is_property_deleter(node: astroid.FunctionDef) -> bool:
- """Check if the given node is a property deleter"""
- return _is_property_kind(node, "deleter")
-
-
def is_property_setter_or_deleter(node: astroid.FunctionDef) -> bool:
"""Check if the given node is either a property setter or a deleter"""
return _is_property_kind(node, "setter", "deleter")