From 98e140194c58950cd73c28f256214bfcca1ad3f5 Mon Sep 17 00:00:00 2001 From: Jakub Rozek Date: Fri, 8 Dec 2023 17:24:11 +0100 Subject: [PATCH] Sort imports using isort --- arcparse/__init__.py | 4 ++-- arcparse/arguments.py | 8 ++++++-- arcparse/parser.py | 20 ++++++++++++++++---- arcparse/subparser.py | 2 +- arcparse/typehints.py | 2 +- tests/test_auto_converter.py | 2 +- tests/test_converter.py | 3 ++- tests/test_defaults.py | 3 ++- tests/test_dynamic_defaults.py | 3 ++- tests/test_flag.py | 1 + tests/test_multiple.py | 2 +- tests/test_mutual_exclusion.py | 3 ++- tests/test_option.py | 1 + tests/test_positional.py | 1 + 14 files changed, 39 insertions(+), 16 deletions(-) diff --git a/arcparse/__init__.py b/arcparse/__init__.py index f98613a..b4dad12 100644 --- a/arcparse/__init__.py +++ b/arcparse/__init__.py @@ -1,7 +1,7 @@ +from .arguments import MxGroup, flag, no_flag, option, positional +from .converters import itemwise from .parser import ArcParser -from .arguments import flag, no_flag, option, positional, MxGroup from .subparser import subparsers -from .converters import itemwise __all__ = [ "ArcParser", diff --git a/arcparse/arguments.py b/arcparse/arguments.py index 9b0b318..42445aa 100644 --- a/arcparse/arguments.py +++ b/arcparse/arguments.py @@ -2,11 +2,15 @@ from argparse import ArgumentParser, _ActionsContainer from collections.abc import Callable from dataclasses import dataclass, field -from collections.abc import Callable from typing import Any, Literal, overload from .converters import itemwise -from .typehints import extract_collection_type, extract_optional_type, extract_type_from_typehint +from .typehints import ( + extract_collection_type, + extract_optional_type, + extract_type_from_typehint, +) + class Void: pass diff --git a/arcparse/parser.py b/arcparse/parser.py index 8bc4395..5b7dbd2 100644 --- a/arcparse/parser.py +++ b/arcparse/parser.py @@ -1,18 +1,30 @@ from __future__ import annotations + from argparse import ArgumentParser -from dataclasses import make_dataclass from collections.abc import Sequence +from dataclasses import make_dataclass from enum import StrEnum from types import NoneType, UnionType from typing import Any, Self, Union, get_args, get_origin import inspect import re -from .arguments import _Option, _BaseValueArgument, _Flag, _BaseArgument, _ValueOverride, MxGroup, void +from .arguments import ( + MxGroup, + _BaseArgument, + _BaseValueArgument, + _Flag, + _Option, + _ValueOverride, + void, +) from .converters import itemwise from .subparser import _Subparsers -from .typehints import extract_collection_type, extract_subparsers_from_typehint, extract_type_from_typehint -from .converters import itemwise +from .typehints import ( + extract_collection_type, + extract_subparsers_from_typehint, + extract_type_from_typehint, +) def _to_bool(value: str) -> bool: diff --git a/arcparse/subparser.py b/arcparse/subparser.py index fae25db..f1dae84 100644 --- a/arcparse/subparser.py +++ b/arcparse/subparser.py @@ -2,7 +2,7 @@ from collections.abc import Sequence from dataclasses import dataclass from types import NoneType -from typing import Any, TYPE_CHECKING +from typing import TYPE_CHECKING, Any if TYPE_CHECKING: from .parser import ArcParser diff --git a/arcparse/typehints.py b/arcparse/typehints.py index d6ec1cc..7ce82b6 100644 --- a/arcparse/typehints.py +++ b/arcparse/typehints.py @@ -1,5 +1,5 @@ -from typing import Optional, Union, get_args, get_origin, TYPE_CHECKING from types import NoneType, UnionType +from typing import TYPE_CHECKING, Optional, Union, get_args, get_origin if TYPE_CHECKING: from .parser import ArcParser diff --git a/tests/test_auto_converter.py b/tests/test_auto_converter.py index f7a607f..a9f2ce6 100644 --- a/tests/test_auto_converter.py +++ b/tests/test_auto_converter.py @@ -1,6 +1,6 @@ from enum import StrEnum, auto -import re from typing import Any, Optional +import re import pytest diff --git a/tests/test_converter.py b/tests/test_converter.py index 91fb9ba..29e8bd2 100644 --- a/tests/test_converter.py +++ b/tests/test_converter.py @@ -1,7 +1,8 @@ from enum import StrEnum, auto + import pytest -from arcparse import ArcParser, option, itemwise +from arcparse import ArcParser, itemwise, option from arcparse.converters import csv diff --git a/tests/test_defaults.py b/tests/test_defaults.py index ae73b01..ce7f267 100644 --- a/tests/test_defaults.py +++ b/tests/test_defaults.py @@ -1,7 +1,8 @@ from typing import Any + import pytest -from arcparse import ArcParser, positional, option, flag, no_flag +from arcparse import ArcParser, flag, no_flag, option, positional class OptArgs(ArcParser): diff --git a/tests/test_dynamic_defaults.py b/tests/test_dynamic_defaults.py index e68c3ed..fa73334 100644 --- a/tests/test_dynamic_defaults.py +++ b/tests/test_dynamic_defaults.py @@ -1,7 +1,8 @@ from typing import Any + import pytest -from arcparse import ArcParser, option, flag, no_flag +from arcparse import ArcParser, flag, no_flag, option class OptArgs(ArcParser): diff --git a/tests/test_flag.py b/tests/test_flag.py index 9c90e44..0e7afa9 100644 --- a/tests/test_flag.py +++ b/tests/test_flag.py @@ -1,4 +1,5 @@ from typing import Any + import pytest from arcparse import ArcParser, flag, no_flag diff --git a/tests/test_multiple.py b/tests/test_multiple.py index 4febbec..22ba431 100644 --- a/tests/test_multiple.py +++ b/tests/test_multiple.py @@ -1,6 +1,6 @@ import pytest -from arcparse import ArcParser, positional, option +from arcparse import ArcParser, option, positional @pytest.mark.parametrize( diff --git a/tests/test_mutual_exclusion.py b/tests/test_mutual_exclusion.py index da07778..985ace0 100644 --- a/tests/test_mutual_exclusion.py +++ b/tests/test_mutual_exclusion.py @@ -1,7 +1,8 @@ from typing import Any + import pytest -from arcparse import ArcParser, MxGroup, option, flag +from arcparse import ArcParser, MxGroup, flag, option def test_group_as_untyped_attribute() -> None: diff --git a/tests/test_option.py b/tests/test_option.py index ad636bf..56fec83 100644 --- a/tests/test_option.py +++ b/tests/test_option.py @@ -1,4 +1,5 @@ from typing import Any, Optional + import pytest from arcparse import ArcParser, option diff --git a/tests/test_positional.py b/tests/test_positional.py index 7d47a6d..a1d1c0e 100644 --- a/tests/test_positional.py +++ b/tests/test_positional.py @@ -1,4 +1,5 @@ from typing import Any + import pytest from arcparse import ArcParser, positional