Skip to content

Commit 14f6e2d

Browse files
authored
Modified the behavior of na.asarray() and na.asanyarray() to return arrays of None if a=None. (#120)
1 parent fc29c96 commit 14f6e2d

File tree

3 files changed

+2
-11
lines changed

3 files changed

+2
-11
lines changed

named_arrays/_named_array_functions.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,8 +81,6 @@ def _asarray_like(
8181
*,
8282
like: None | LikeT = None,
8383
) -> ArrayT | LikeT:
84-
if a is None:
85-
return None
8684

8785
if like is None:
8886
like = na.ScalarArray(None)

named_arrays/_scalars/tests/test_scalars.py

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -641,16 +641,13 @@ def test_asarray_like_functions(
641641
a = array
642642
like = array_2
643643

644-
if a is None:
645-
assert func(a, like=like) is None
646-
return
647-
648644
result = func(a, like=like)
649645

650646
assert isinstance(result, na.ScalarArray)
651647
assert isinstance(result.ndarray, np.ndarray)
652648

653-
assert np.all(result.value == na.value(a))
649+
if a is not None:
650+
assert np.all(result.value == na.value(a))
654651

655652
super().test_asarray_like_functions(
656653
func=func,

named_arrays/_vectors/tests/test_vectors.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -212,10 +212,6 @@ def test_asarray_like_functions(
212212
a = array
213213
like = array_2
214214

215-
if a is None:
216-
assert func(a, like=like) is None
217-
return
218-
219215
if isinstance(a, na.AbstractVectorArray):
220216
if isinstance(like, na.AbstractVectorArray):
221217
if a.type_explicit != like.type_explicit:

0 commit comments

Comments
 (0)