Skip to content

Commit 46dcbd5

Browse files
authored
chore: cleanup (#563)
1 parent e83ac4c commit 46dcbd5

File tree

5 files changed

+13
-12
lines changed

5 files changed

+13
-12
lines changed

README.md

-1
Original file line numberDiff line numberDiff line change
@@ -13,5 +13,4 @@ This package was kindly donated to the [Pydantic organisation](https://github.co
1313

1414
For the old "Hipster-orgazmic tool to manage application settings" package, see [version 0.2.5](https://pypi.org/project/pydantic-settings/0.2.5/).
1515

16-
1716
See [documentation](https://docs.pydantic.dev/latest/concepts/pydantic_settings/) for more details.

pydantic_settings/main.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ class BaseSettings(BaseModel):
121121
into `None` type(None). Defaults to `None` type(None), which means no parsing should occur.
122122
_env_parse_enums: Parse enum field names to values. Defaults to `None.`, which means no parsing should occur.
123123
_cli_prog_name: The CLI program name to display in help text. Defaults to `None` if _cli_parse_args is `None`.
124-
Otherwse, defaults to sys.argv[0].
124+
Otherwise, defaults to sys.argv[0].
125125
_cli_parse_args: The list of CLI arguments to parse. Defaults to None.
126126
If set to `True`, defaults to sys.argv[1:].
127127
_cli_settings_source: Override the default CLI settings source with a user defined instance. Defaults to None.

pydantic_settings/sources/providers/cli.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -548,11 +548,11 @@ def _sort_arg_fields(self, model: type[BaseModel]) -> list[tuple[str, FieldInfo]
548548
if positional_variadic_arg:
549549
if len(positional_variadic_arg) > 1:
550550
field_names = ', '.join([name for name, info in positional_variadic_arg])
551-
raise SettingsError(f'{model.__name__} has multiple variadic positonal arguments: {field_names}')
551+
raise SettingsError(f'{model.__name__} has multiple variadic positional arguments: {field_names}')
552552
elif subcommand_args:
553553
field_names = ', '.join([name for name, info in positional_variadic_arg + subcommand_args])
554554
raise SettingsError(
555-
f'{model.__name__} has variadic positonal arguments and subcommand arguments: {field_names}'
555+
f'{model.__name__} has variadic positional arguments and subcommand arguments: {field_names}'
556556
)
557557

558558
return positional_args + positional_variadic_arg + subcommand_args + optional_args

tests/test_settings.py

+4-2
Original file line numberDiff line numberDiff line change
@@ -913,7 +913,7 @@ class Settings(BaseSettings, env_nested_delimiter='__'):
913913
assert s.n.bar == 'bar value'
914914

915915

916-
def test_nested_vanila_dataclass(env):
916+
def test_nested_vanilla_dataclass(env):
917917
@dataclasses.dataclass
918918
class MyDataclass:
919919
value: str
@@ -1732,7 +1732,9 @@ class Settings(BaseSettings):
17321732

17331733
model_config = SettingsConfigDict(secrets_dir=tmp_path)
17341734

1735-
with pytest.warns(UserWarning, match=f'attempted to load secret file "{tmp_path}/foo" but found a directory inste'):
1735+
with pytest.warns(
1736+
UserWarning, match=f'attempted to load secret file "{tmp_path}/foo" but found a directory instead'
1737+
):
17361738
Settings()
17371739

17381740

tests/test_source_cli.py

+6-6
Original file line numberDiff line numberDiff line change
@@ -1450,25 +1450,25 @@ class PositionalArgNotOutermost(BaseSettings, cli_parse_args=True):
14501450

14511451
with pytest.raises(
14521452
SettingsError,
1453-
match='MultipleVariadicPositionialArgs has multiple variadic positonal arguments: strings, numbers',
1453+
match='MultipleVariadicPositionalArgs has multiple variadic positional arguments: strings, numbers',
14541454
):
14551455

1456-
class MultipleVariadicPositionialArgs(BaseSettings, cli_parse_args=True):
1456+
class MultipleVariadicPositionalArgs(BaseSettings, cli_parse_args=True):
14571457
strings: CliPositionalArg[list[str]]
14581458
numbers: CliPositionalArg[list[int]]
14591459

1460-
MultipleVariadicPositionialArgs()
1460+
MultipleVariadicPositionalArgs()
14611461

14621462
with pytest.raises(
14631463
SettingsError,
1464-
match='VariadicPositionialArgAndSubCommand has variadic positonal arguments and subcommand arguments: strings, sub_cmd',
1464+
match='VariadicPositionalArgAndSubCommand has variadic positional arguments and subcommand arguments: strings, sub_cmd',
14651465
):
14661466

1467-
class VariadicPositionialArgAndSubCommand(BaseSettings, cli_parse_args=True):
1467+
class VariadicPositionalArgAndSubCommand(BaseSettings, cli_parse_args=True):
14681468
strings: CliPositionalArg[list[str]]
14691469
sub_cmd: CliSubCommand[SubCmd]
14701470

1471-
VariadicPositionialArgAndSubCommand()
1471+
VariadicPositionalArgAndSubCommand()
14721472

14731473
with pytest.raises(
14741474
SettingsError, match=re.escape("cli_parse_args must be a list or tuple of strings, received <class 'str'>")

0 commit comments

Comments
 (0)