Skip to content

Commit 2b87587

Browse files
dizzy57AlexWaygood
authored andcommitted
[flake8-pytest-style] Fix defaults when lint.flake8-pytest-style config section is empty (PT001, PT023) (#13292)
1 parent d1e15f6 commit 2b87587

File tree

2 files changed

+5
-10
lines changed

2 files changed

+5
-10
lines changed

crates/ruff_workspace/src/configuration.rs

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -347,9 +347,7 @@ impl Configuration {
347347
.unwrap_or_default(),
348348
flake8_pytest_style: lint
349349
.flake8_pytest_style
350-
.map(|options| {
351-
Flake8PytestStyleOptions::try_into_settings(options, lint_preview)
352-
})
350+
.map(Flake8PytestStyleOptions::try_into_settings)
353351
.transpose()?
354352
.unwrap_or_default(),
355353
flake8_quotes: lint

crates/ruff_workspace/src/options.rs

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ use ruff_linter::rules::{
2727
pycodestyle, pydocstyle, pyflakes, pylint, pyupgrade, ruff,
2828
};
2929
use ruff_linter::settings::types::{
30-
IdentifierPattern, OutputFormat, PreviewMode, PythonVersion, RequiredVersion,
30+
IdentifierPattern, OutputFormat, PythonVersion, RequiredVersion,
3131
};
3232
use ruff_linter::{warn_user_once, RuleSelector};
3333
use ruff_macros::{CombineOptions, OptionsMetadata};
@@ -1500,12 +1500,9 @@ pub struct Flake8PytestStyleOptions {
15001500
}
15011501

15021502
impl Flake8PytestStyleOptions {
1503-
pub fn try_into_settings(
1504-
self,
1505-
preview: PreviewMode,
1506-
) -> anyhow::Result<flake8_pytest_style::settings::Settings> {
1503+
pub fn try_into_settings(self) -> anyhow::Result<flake8_pytest_style::settings::Settings> {
15071504
Ok(flake8_pytest_style::settings::Settings {
1508-
fixture_parentheses: self.fixture_parentheses.unwrap_or(preview.is_disabled()),
1505+
fixture_parentheses: self.fixture_parentheses.unwrap_or_default(),
15091506
parametrize_names_type: self.parametrize_names_type.unwrap_or_default(),
15101507
parametrize_values_type: self.parametrize_values_type.unwrap_or_default(),
15111508
parametrize_values_row_type: self.parametrize_values_row_type.unwrap_or_default(),
@@ -1531,7 +1528,7 @@ impl Flake8PytestStyleOptions {
15311528
.transpose()
15321529
.map_err(SettingsError::InvalidRaisesExtendRequireMatchFor)?
15331530
.unwrap_or_default(),
1534-
mark_parentheses: self.mark_parentheses.unwrap_or(preview.is_disabled()),
1531+
mark_parentheses: self.mark_parentheses.unwrap_or_default(),
15351532
})
15361533
}
15371534
}

0 commit comments

Comments
 (0)