Skip to content

Commit 8a196f5

Browse files
author
Nikolay Dolzhenkov
committed
Avoid using walrus for the sake of python 3.7
1 parent 6c0289e commit 8a196f5

File tree

1 file changed

+9
-12
lines changed

1 file changed

+9
-12
lines changed

ninja/filter_schema.py

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -195,19 +195,16 @@ def _connect_fields(self) -> Q:
195195
class_ignore_none = self.model_config.get("ignore_none", DEFAULT_IGNORE_NONE)
196196
for field_name, field_info in self.__class__.model_fields.items():
197197
filter_value = getattr(self, field_name)
198+
198199
# class-level ignore_none set to False (non-default) takes precedence over field-level ignore_none
199-
ignore_none = (
200-
False
201-
if class_ignore_none is False
202-
else field_ignore_none
203-
if (
204-
field_ignore_none := self._get_field_ignore_none(
205-
field_name, field_info
206-
)
207-
)
208-
is not None
209-
else DEFAULT_IGNORE_NONE
210-
)
200+
if class_ignore_none is False:
201+
ignore_none = False
202+
else:
203+
field_ignore_none = self._get_field_ignore_none(field_name, field_info)
204+
if field_ignore_none is not None:
205+
ignore_none = field_ignore_none
206+
else:
207+
ignore_none = DEFAULT_IGNORE_NONE
211208

212209
# Resolve Q expression for a field even if we skip it due to None value
213210
# So that improperly configured fields are easier to detect

0 commit comments

Comments
 (0)