Skip to content

Commit

Permalink
Remove walrus
Browse files Browse the repository at this point in the history
  • Loading branch information
Tinche committed Dec 18, 2021
1 parent 81d7756 commit bb4383c
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 11 deletions.
5 changes: 2 additions & 3 deletions src/cattr/preconf/bson.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,8 @@ def configure_converter(converter: GenConverter):

def gen_unstructure_mapping(cl: Any, unstructure_to=None):
key_handler = str
if (args := getattr(cl, "__args__", None)) and issubclass(
args[0], str
):
args = getattr(cl, "__args__", None)
if args and issubclass(args[0], str):
key_handler = None
return converter.gen_unstructure_mapping(
cl, unstructure_to=unstructure_to, key_handler=key_handler
Expand Down
7 changes: 2 additions & 5 deletions src/cattr/preconf/orjson.py
Original file line number Diff line number Diff line change
Expand Up @@ -30,11 +30,8 @@ def configure_converter(converter: GenConverter):

def gen_unstructure_mapping(cl: Any, unstructure_to=None):
key_handler = str
if (
(args := getattr(cl, "__args__", None))
and issubclass(args[0], str)
and issubclass(args[0], Enum)
):
args = getattr(cl, "__args__", None)
if args and issubclass(args[0], str) and issubclass(args[0], Enum):

def key_handler(v):
return v.value
Expand Down
5 changes: 2 additions & 3 deletions src/cattr/preconf/tomlkit.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,8 @@ def configure_converter(converter: GenConverter):

def gen_unstructure_mapping(cl: Any, unstructure_to=None):
key_handler = str
if (args := getattr(cl, "__args__", None)) and issubclass(
args[0], str
):
args = getattr(cl, "__args__", None)
if args and issubclass(args[0], str):
key_handler = None
return converter.gen_unstructure_mapping(
cl, unstructure_to=unstructure_to, key_handler=key_handler
Expand Down

0 comments on commit bb4383c

Please sign in to comment.