Skip to content

Commit ab76ca6

Browse files
CopilotBorda
andcommitted
Simplify redundant conditional in _convert_args_kwargs
- Removed redundant if-else where both branches performed the same action - Simplified kwds handling to always use kwargs.update(kwds) - Removed unused var_keyword_name variable - All 68 tests still pass Co-authored-by: Borda <6035284+Borda@users.noreply.github.com>
1 parent 79b47fd commit ab76ca6

1 file changed

Lines changed: 3 additions & 15 deletions

File tree

src/cachier/core.py

Lines changed: 3 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -79,17 +79,14 @@ def _convert_args_kwargs(func, _is_method: bool, args: tuple, kwds: dict) -> dic
7979
sig = inspect.signature(func)
8080
func_params = list(sig.parameters)
8181

82-
# Separate regular parameters from VAR_POSITIONAL and VAR_KEYWORD
82+
# Separate regular parameters from VAR_POSITIONAL
8383
regular_params = []
8484
var_positional_name = None
85-
var_keyword_name = None
8685

8786
for param_name in func_params:
8887
param = sig.parameters[param_name]
8988
if param.kind == inspect.Parameter.VAR_POSITIONAL:
9089
var_positional_name = param_name
91-
elif param.kind == inspect.Parameter.VAR_KEYWORD:
92-
var_keyword_name = param_name
9390
elif param.kind in (
9491
inspect.Parameter.POSITIONAL_ONLY,
9592
inspect.Parameter.POSITIONAL_OR_KEYWORD,
@@ -122,17 +119,8 @@ def _convert_args_kwargs(func, _is_method: bool, args: tuple, kwds: dict) -> dic
122119
# Merge args expanded as kwargs and the original kwds
123120
kwargs.update(args_as_kw)
124121

125-
# Handle variadic keyword arguments and keyword-only parameters
126-
if var_keyword_name:
127-
# Separate kwds that match known parameters from those that don't
128-
for k, v in kwds.items():
129-
if k in sig.parameters:
130-
kwargs[k] = v
131-
else:
132-
# Extra kwargs go directly into the result dict
133-
kwargs[k] = v
134-
else:
135-
kwargs.update(kwds)
122+
# Handle keyword arguments (including variadic keyword arguments)
123+
kwargs.update(kwds)
136124

137125
return OrderedDict(sorted(kwargs.items()))
138126

0 commit comments

Comments
 (0)