diff options
| author | Bas van Beek <b.f.van.beek@vu.nl> | 2021-12-15 14:25:14 +0100 |
|---|---|---|
| committer | Bas van Beek <b.f.van.beek@vu.nl> | 2021-12-15 14:35:05 +0100 |
| commit | fe491ec65c468928d32e87c97dd275ba6da7a9d5 (patch) | |
| tree | 882e5eb86fe71c49d281514d3d2556c31a966c0a | |
| parent | 12d0c6a7096a9b666f6f2951e71776eed3a1ade5 (diff) | |
| download | numpy-fe491ec65c468928d32e87c97dd275ba6da7a9d5.tar.gz | |
MAINT: Allow the `loadtxt` comments parameter to be `None`
| -rw-r--r-- | numpy/lib/npyio.pyi | 6 | ||||
| -rw-r--r-- | numpy/typing/tests/data/reveal/npyio.pyi | 1 |
2 files changed, 4 insertions, 3 deletions
diff --git a/numpy/lib/npyio.pyi b/numpy/lib/npyio.pyi index 8fd36ca6f..75d06e9e3 100644 --- a/numpy/lib/npyio.pyi +++ b/numpy/lib/npyio.pyi @@ -140,7 +140,7 @@ def savez_compressed( def loadtxt( fname: str | os.PathLike[str] | Iterable[str] | Iterable[bytes], dtype: None = ..., - comments: str | Sequence[str] = ..., + comments: None | str | Sequence[str] = ..., delimiter: None | str = ..., converters: None | Mapping[int | str, Callable[[str], Any]] = ..., skiprows: int = ..., @@ -156,7 +156,7 @@ def loadtxt( def loadtxt( fname: str | os.PathLike[str] | Iterable[str] | Iterable[bytes], dtype: _DTypeLike[_SCT], - comments: str | Sequence[str] = ..., + comments: None | str | Sequence[str] = ..., delimiter: None | str = ..., converters: None | Mapping[int | str, Callable[[str], Any]] = ..., skiprows: int = ..., @@ -172,7 +172,7 @@ def loadtxt( def loadtxt( fname: str | os.PathLike[str] | Iterable[str] | Iterable[bytes], dtype: DTypeLike, - comments: str | Sequence[str] = ..., + comments: None | str | Sequence[str] = ..., delimiter: None | str = ..., converters: None | Mapping[int | str, Callable[[str], Any]] = ..., skiprows: int = ..., diff --git a/numpy/typing/tests/data/reveal/npyio.pyi b/numpy/typing/tests/data/reveal/npyio.pyi index f54fbf610..637bdb661 100644 --- a/numpy/typing/tests/data/reveal/npyio.pyi +++ b/numpy/typing/tests/data/reveal/npyio.pyi @@ -64,6 +64,7 @@ reveal_type(np.loadtxt(bytes_file)) # E: ndarray[Any, dtype[{float64}]] reveal_type(np.loadtxt(pathlib_path, dtype=np.str_)) # E: ndarray[Any, dtype[str_]] reveal_type(np.loadtxt(str_path, dtype=str, skiprows=2)) # E: ndarray[Any, dtype[Any]] reveal_type(np.loadtxt(str_file, comments="test")) # E: ndarray[Any, dtype[{float64}]] +reveal_type(np.loadtxt(str_file, comments=None)) # E: ndarray[Any, dtype[{float64}]] reveal_type(np.loadtxt(str_path, delimiter="\n")) # E: ndarray[Any, dtype[{float64}]] reveal_type(np.loadtxt(str_path, ndmin=2)) # E: ndarray[Any, dtype[{float64}]] reveal_type(np.loadtxt(["1", "2", "3"])) # E: ndarray[Any, dtype[{float64}]] |