Skip to content

Commit 75d9ab8

Browse files
committed
Use a hack-default of "" instead of None to make typing easier
Signed-off-by: Michał Górny <mgorny@quansight.com>
1 parent 568e1db commit 75d9ab8

3 files changed

Lines changed: 3 additions & 6 deletions

File tree

variantlib/api.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,6 @@ def get_variant_environment_dict(
337337
) -> dict[str, set[str] | str]:
338338
"""Get the dict for packaging Marker.evaluate()"""
339339

340-
assert variant_desc.label is not None
341340
ret: dict[str, set[str] | str] = {
342341
"variant_namespaces": {vprop.namespace for vprop in variant_desc.properties},
343342
"variant_features": {
@@ -371,7 +370,6 @@ def get_variant_label(
371370
"""
372371

373372
if custom_label is None:
374-
assert variant_desc.label is not None
375373
return variant_desc.label
376374

377375
warnings.warn(

variantlib/models/variant.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ class VariantDescription(BaseModel):
162162
default_factory=list,
163163
)
164164

165-
label: str | None = field(
165+
label: str = field(
166166
metadata={
167167
"validator": lambda val: validate_and(
168168
[
@@ -172,7 +172,7 @@ class VariantDescription(BaseModel):
172172
value=val,
173173
),
174174
},
175-
default=None,
175+
default="",
176176
)
177177

178178
def __post_init__(self) -> None:
@@ -185,7 +185,7 @@ def __post_init__(self) -> None:
185185
object.__setattr__(self, "properties", sorted(self.properties))
186186

187187
# default the label to "null" or hexdigest
188-
if self.label is None:
188+
if not self.label:
189189
with contextlib.suppress(AttributeError):
190190
object.__setattr__(
191191
self,

variantlib/variant_dist_info.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,4 @@ def variant_desc(self) -> VariantDescription:
5656

5757
@variant_desc.setter
5858
def variant_desc(self, new_desc: VariantDescription) -> None:
59-
assert new_desc.label is not None
6059
self.variants = {new_desc.label: new_desc}

0 commit comments

Comments
 (0)