diff --git a/crates/ruff_linter/src/rules/pylint/mod.rs b/crates/ruff_linter/src/rules/pylint/mod.rs index 32ec558580..f8fd1c7597 100644 --- a/crates/ruff_linter/src/rules/pylint/mod.rs +++ b/crates/ruff_linter/src/rules/pylint/mod.rs @@ -445,7 +445,6 @@ mod tests { Rule::RepeatedEqualityComparison, Path::new("repeated_equality_comparison.py") )] - #[test_case(Rule::InvalidEnvvarDefault, Path::new("invalid_envvar_default.py"))] #[test_case(Rule::BadStrStripCall, Path::new("bad_str_strip_call.py"))] #[test_case( Rule::BadStaticmethodArgument, diff --git a/crates/ruff_linter/src/rules/pylint/rules/invalid_envvar_default.rs b/crates/ruff_linter/src/rules/pylint/rules/invalid_envvar_default.rs index 51cf79b7ca..7a4e935b3d 100644 --- a/crates/ruff_linter/src/rules/pylint/rules/invalid_envvar_default.rs +++ b/crates/ruff_linter/src/rules/pylint/rules/invalid_envvar_default.rs @@ -52,14 +52,10 @@ pub(crate) fn invalid_envvar_default(checker: &Checker, call: &ast::ExprCall) { .semantic() .resolve_qualified_name(&call.func) .is_some_and(|qualified_name| { - if checker.settings.preview.is_enabled() { - matches!( - qualified_name.segments(), - ["os", "getenv"] | ["os", "environ", "get"] - ) - } else { - matches!(qualified_name.segments(), ["os", "getenv"]) - } + matches!( + qualified_name.segments(), + ["os", "getenv"] | ["os", "environ", "get"] + ) }) { // Find the `default` argument, if it exists. diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW1508_invalid_envvar_default.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW1508_invalid_envvar_default.py.snap index b1fed4b4b9..0ad2917d0c 100644 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW1508_invalid_envvar_default.py.snap +++ b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__PLW1508_invalid_envvar_default.py.snap @@ -50,3 +50,13 @@ invalid_envvar_default.py:14:17: PLW1508 Invalid type for environment variable d 15 | os.environ.get("TEST", 12) # [invalid-envvar-default] 16 | os.environ.get("TEST", "AA" * 12) | + +invalid_envvar_default.py:15:24: PLW1508 Invalid type for environment variable default; expected `str` or `None` + | +13 | os.getenv("AA", "GOOD" if Z else "BAR") +14 | os.getenv("AA", 1 if Z else "BAR") # [invalid-envvar-default] +15 | os.environ.get("TEST", 12) # [invalid-envvar-default] + | ^^ PLW1508 +16 | os.environ.get("TEST", "AA" * 12) +17 | os.environ.get("TEST", 13 * "AA") + | diff --git a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__preview__PLW1508_invalid_envvar_default.py.snap b/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__preview__PLW1508_invalid_envvar_default.py.snap deleted file mode 100644 index 0ad2917d0c..0000000000 --- a/crates/ruff_linter/src/rules/pylint/snapshots/ruff_linter__rules__pylint__tests__preview__PLW1508_invalid_envvar_default.py.snap +++ /dev/null @@ -1,62 +0,0 @@ ---- -source: crates/ruff_linter/src/rules/pylint/mod.rs ---- -invalid_envvar_default.py:3:29: PLW1508 Invalid type for environment variable default; expected `str` or `None` - | -1 | import os -2 | -3 | tempVar = os.getenv("TEST", 12) # [invalid-envvar-default] - | ^^ PLW1508 -4 | goodVar = os.getenv("TESTING", None) -5 | dictVarBad = os.getenv("AAA", {"a", 7}) # [invalid-envvar-default] - | - -invalid_envvar_default.py:5:31: PLW1508 Invalid type for environment variable default; expected `str` or `None` - | -3 | tempVar = os.getenv("TEST", 12) # [invalid-envvar-default] -4 | goodVar = os.getenv("TESTING", None) -5 | dictVarBad = os.getenv("AAA", {"a", 7}) # [invalid-envvar-default] - | ^^^^^^^^ PLW1508 -6 | print(os.getenv("TEST", False)) # [invalid-envvar-default] -7 | os.getenv("AA", "GOOD") - | - -invalid_envvar_default.py:6:25: PLW1508 Invalid type for environment variable default; expected `str` or `None` - | -4 | goodVar = os.getenv("TESTING", None) -5 | dictVarBad = os.getenv("AAA", {"a", 7}) # [invalid-envvar-default] -6 | print(os.getenv("TEST", False)) # [invalid-envvar-default] - | ^^^^^ PLW1508 -7 | os.getenv("AA", "GOOD") -8 | os.getenv("AA", f"GOOD") - | - -invalid_envvar_default.py:10:17: PLW1508 Invalid type for environment variable default; expected `str` or `None` - | - 8 | os.getenv("AA", f"GOOD") - 9 | os.getenv("AA", "GOOD" + "BAR") -10 | os.getenv("AA", "GOOD" + 1) - | ^^^^^^^^^^ PLW1508 -11 | os.getenv("AA", "GOOD %s" % "BAR") -12 | os.getenv("B", Z) - | - -invalid_envvar_default.py:14:17: PLW1508 Invalid type for environment variable default; expected `str` or `None` - | -12 | os.getenv("B", Z) -13 | os.getenv("AA", "GOOD" if Z else "BAR") -14 | os.getenv("AA", 1 if Z else "BAR") # [invalid-envvar-default] - | ^^^^^^^^^^^^^^^^^ PLW1508 -15 | os.environ.get("TEST", 12) # [invalid-envvar-default] -16 | os.environ.get("TEST", "AA" * 12) - | - -invalid_envvar_default.py:15:24: PLW1508 Invalid type for environment variable default; expected `str` or `None` - | -13 | os.getenv("AA", "GOOD" if Z else "BAR") -14 | os.getenv("AA", 1 if Z else "BAR") # [invalid-envvar-default] -15 | os.environ.get("TEST", 12) # [invalid-envvar-default] - | ^^ PLW1508 -16 | os.environ.get("TEST", "AA" * 12) -17 | os.environ.get("TEST", 13 * "AA") - |