Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[pylint] Add allow-dunder-method-names setting for bad-dunder-method-name (PLW3201) #8812

Merged
merged 2 commits into from
Nov 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def __doc__(self):
return "Docstring"

# Added in Python 3.12
def __buffer__(self):
def __buffer__(self):
return memoryview(b'')

def __release_buffer__(self, buf):
Expand Down Expand Up @@ -83,6 +83,10 @@ def _missing_(cls, value):
def _(self):
pass

# Allow custom dunder names (via setting).
def __special_custom_magic__(self):
pass


def __foo_bar__(): # this is not checked by the [bad-dunder-name] rule
...
11 changes: 10 additions & 1 deletion crates/ruff_linter/src/rules/pylint/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ mod tests {

use anyhow::Result;
use regex::Regex;
use rustc_hash::FxHashSet;
use test_case::test_case;

use crate::assert_messages;
Expand Down Expand Up @@ -157,7 +158,15 @@ mod tests {
let snapshot = format!("{}_{}", rule_code.noqa_code(), path.to_string_lossy());
let diagnostics = test_path(
Path::new("pylint").join(path).as_path(),
&LinterSettings::for_rule(rule_code),
&LinterSettings {
pylint: pylint::settings::Settings {
allow_dunder_method_names: FxHashSet::from_iter([
"__special_custom_magic__".to_string()
]),
..pylint::settings::Settings::default()
},
..LinterSettings::for_rule(rule_code)
},
)?;
assert_messages!(snapshot, diagnostics);
Ok(())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,9 @@ use crate::checkers::ast::Checker;
/// one underscore (e.g., `_str_`), but ignores known dunder methods (like
/// `__init__`), as well as methods that are marked with `@override`.
///
/// Additional dunder methods names can be allowed via the
/// [`pylint.allow-dunder-method-names`] setting.
///
/// ## Example
/// ```python
/// class Foo:
Expand All @@ -35,6 +38,9 @@ use crate::checkers::ast::Checker;
/// def __init__(self):
/// ...
/// ```
///
/// ## Options
/// - `pylint.allow-dunder-method-names`
#[violation]
pub struct BadDunderMethodName {
name: String,
Expand All @@ -54,7 +60,14 @@ pub(crate) fn bad_dunder_method_name(checker: &mut Checker, class_body: &[Stmt])
.iter()
.filter_map(ruff_python_ast::Stmt::as_function_def_stmt)
.filter(|method| {
if is_known_dunder_method(&method.name) || matches!(method.name.as_str(), "_") {
if is_known_dunder_method(&method.name)
|| checker
.settings
.pylint
.allow_dunder_method_names
.contains(method.name.as_str())
|| matches!(method.name.as_str(), "_")
{
return false;
}
method.name.starts_with('_') && method.name.ends_with('_')
Expand Down
3 changes: 3 additions & 0 deletions crates/ruff_linter/src/rules/pylint/settings.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
//! Settings for the `pylint` plugin.

use rustc_hash::FxHashSet;
use serde::{Deserialize, Serialize};

use ruff_macros::CacheKey;
Expand Down Expand Up @@ -36,6 +37,7 @@ impl ConstantType {
#[derive(Debug, CacheKey)]
pub struct Settings {
pub allow_magic_value_types: Vec<ConstantType>,
pub allow_dunder_method_names: FxHashSet<String>,
pub max_args: usize,
pub max_returns: usize,
pub max_bool_expr: usize,
Expand All @@ -48,6 +50,7 @@ impl Default for Settings {
fn default() -> Self {
Self {
allow_magic_value_types: vec![ConstantType::Str, ConstantType::Bytes],
allow_dunder_method_names: FxHashSet::default(),
max_args: 5,
max_returns: 6,
max_bool_expr: 5,
Expand Down
12 changes: 12 additions & 0 deletions crates/ruff_workspace/src/options.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2545,6 +2545,17 @@ pub struct PylintOptions {
)]
pub allow_magic_value_types: Option<Vec<ConstantType>>,

/// Dunder methods name to allow, in addition to the default set from the
/// Python standard library (see: `PLW3201`).
#[option(
default = r#"[]"#,
value_type = r#"list[str]"#,
example = r#"
allow-dunder-method-names = ["__tablename__", "__table_args__"]
"#
)]
pub allow_dunder_method_names: Option<FxHashSet<String>>,

/// Maximum number of branches allowed for a function or method body (see:
/// `PLR0912`).
#[option(default = r"12", value_type = "int", example = r"max-branches = 12")]
Expand Down Expand Up @@ -2586,6 +2597,7 @@ impl PylintOptions {
allow_magic_value_types: self
.allow_magic_value_types
.unwrap_or(defaults.allow_magic_value_types),
allow_dunder_method_names: self.allow_dunder_method_names.unwrap_or_default(),
max_args: self.max_args.unwrap_or(defaults.max_args),
max_bool_expr: self.max_bool_expr.unwrap_or(defaults.max_bool_expr),
max_returns: self.max_returns.unwrap_or(defaults.max_returns),
Expand Down
11 changes: 11 additions & 0 deletions ruff.schema.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading