Skip to content

Commit 39db433

Browse files
authored
fix: remove filename redundant check + is_none_backed -> isbacked (#2431)
1 parent a4d76b3 commit 39db433

2 files changed

Lines changed: 8 additions & 10 deletions

File tree

src/anndata/_core/aligned_mapping.py

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -338,7 +338,7 @@ class LayersBase(AlignedMappingBase[TwoDIdx, str | None]):
338338
attrname: ClassVar[Literal["layers"]] = "layers"
339339
axes: ClassVar[tuple[Literal[0], Literal[1]]] = (0, 1)
340340

341-
is_none_backed: bool
341+
isbacked: bool
342342

343343
def __bool__(self) -> bool:
344344
return not self.keys() <= {None}
@@ -347,12 +347,10 @@ def __bool__(self) -> bool:
347347
class Layers(AlignedActual[TwoDIdx, str | None], LayersBase):
348348
def __init__(self, parent: AnnData, *, store: MutableMapping[str | None, Value]):
349349
super().__init__(parent, store=store)
350-
self.is_none_backed = (
351-
None not in self._data and self.parent.filename is not None
352-
)
350+
self.isbacked = None not in self._data and self.parent.filename is not None
353351

354352
def __getitem__(self, key: str | None) -> Value:
355-
if key is None and self.is_none_backed:
353+
if key is None and self.isbacked:
356354
if not self.parent.file.is_open:
357355
self.parent.file.open()
358356
X = self.parent.file["X"]
@@ -365,18 +363,18 @@ def __getitem__(self, key: str | None) -> Value:
365363

366364
def __iter__(self) -> str | None:
367365
keys_iter = super().__iter__()
368-
if self.is_none_backed:
366+
if self.isbacked:
369367
yield from chain([None], keys_iter)
370368
yield from keys_iter
371369

372370
def __len__(self) -> int:
373371
data_length = super().__len__()
374-
if self.is_none_backed:
372+
if self.isbacked:
375373
return data_length + 1
376374
return data_length
377375

378376
def __contains__(self, key: str | None) -> bool:
379-
if key is None and self.is_none_backed:
377+
if key is None and self.isbacked:
380378
return True
381379
return super().__contains__(key)
382380

@@ -386,7 +384,7 @@ def __init__(
386384
self, parent_mapping: LayersBase, parent_view: AnnData, subset_idx: TwoDIdx
387385
) -> None:
388386
super().__init__(parent_mapping, parent_view, subset_idx)
389-
self.is_none_backed = parent_mapping.is_none_backed
387+
self.isbacked = parent_mapping.isbacked
390388

391389

392390
LayersBase._view_class = LayersView

src/anndata/_core/anndata.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -962,7 +962,7 @@ def uns_keys(self) -> list[str]:
962962
@property
963963
def isbacked(self) -> bool:
964964
"""`True` if object is backed on disk, `False` otherwise."""
965-
return self.filename is not None and self.layers.is_none_backed
965+
return self.layers.isbacked
966966

967967
@property
968968
def is_view(self) -> bool:

0 commit comments

Comments
 (0)