Skip to content

Commit 56985bb

Browse files
authored
TYP: read_csv/table (names index_col) (#47124)
* TYP: read_csv/table (names, usecols, and index_col) * unused import * remove usecols
1 parent 729d17c commit 56985bb

File tree

1 file changed

+24
-23
lines changed

1 file changed

+24
-23
lines changed

pandas/io/parsers/readers.py

+24-23
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
IO,
1212
Any,
1313
Callable,
14+
Hashable,
1415
Literal,
1516
NamedTuple,
1617
Sequence,
@@ -23,11 +24,11 @@
2324
import pandas._libs.lib as lib
2425
from pandas._libs.parsers import STR_NA_VALUES
2526
from pandas._typing import (
26-
ArrayLike,
2727
CompressionOptions,
2828
CSVEngine,
2929
DtypeArg,
3030
FilePath,
31+
IndexLabel,
3132
ReadCsvBuffer,
3233
StorageOptions,
3334
)
@@ -521,7 +522,7 @@ def validate_integer(name, val, min_val=0):
521522
return val
522523

523524

524-
def _validate_names(names):
525+
def _validate_names(names: Sequence[Hashable] | None) -> None:
525526
"""
526527
Raise ValueError if the `names` parameter contains duplicates or has an
527528
invalid data type.
@@ -596,8 +597,8 @@ def read_csv(
596597
sep: str | None | lib.NoDefault = ...,
597598
delimiter: str | None | lib.NoDefault = ...,
598599
header: int | Sequence[int] | None | Literal["infer"] = ...,
599-
names=...,
600-
index_col=...,
600+
names: Sequence[Hashable] | None | lib.NoDefault = ...,
601+
index_col: IndexLabel | Literal[False] | None = ...,
601602
usecols=...,
602603
squeeze: bool | None = ...,
603604
prefix: str | lib.NoDefault = ...,
@@ -656,8 +657,8 @@ def read_csv(
656657
sep: str | None | lib.NoDefault = ...,
657658
delimiter: str | None | lib.NoDefault = ...,
658659
header: int | Sequence[int] | None | Literal["infer"] = ...,
659-
names=...,
660-
index_col=...,
660+
names: Sequence[Hashable] | None | lib.NoDefault = ...,
661+
index_col: IndexLabel | Literal[False] | None = ...,
661662
usecols=...,
662663
squeeze: bool | None = ...,
663664
prefix: str | lib.NoDefault = ...,
@@ -716,8 +717,8 @@ def read_csv(
716717
sep: str | None | lib.NoDefault = ...,
717718
delimiter: str | None | lib.NoDefault = ...,
718719
header: int | Sequence[int] | None | Literal["infer"] = ...,
719-
names=...,
720-
index_col=...,
720+
names: Sequence[Hashable] | None | lib.NoDefault = ...,
721+
index_col: IndexLabel | Literal[False] | None = ...,
721722
usecols=...,
722723
squeeze: bool | None = ...,
723724
prefix: str | lib.NoDefault = ...,
@@ -776,8 +777,8 @@ def read_csv(
776777
sep: str | None | lib.NoDefault = ...,
777778
delimiter: str | None | lib.NoDefault = ...,
778779
header: int | Sequence[int] | None | Literal["infer"] = ...,
779-
names=...,
780-
index_col=...,
780+
names: Sequence[Hashable] | None | lib.NoDefault = ...,
781+
index_col: IndexLabel | Literal[False] | None = ...,
781782
usecols=...,
782783
squeeze: bool | None = ...,
783784
prefix: str | lib.NoDefault = ...,
@@ -846,8 +847,8 @@ def read_csv(
846847
delimiter: str | None | lib.NoDefault = None,
847848
# Column and Index Locations and Names
848849
header: int | Sequence[int] | None | Literal["infer"] = "infer",
849-
names=lib.no_default,
850-
index_col=None,
850+
names: Sequence[Hashable] | None | lib.NoDefault = lib.no_default,
851+
index_col: IndexLabel | Literal[False] | None = None,
851852
usecols=None,
852853
squeeze: bool | None = None,
853854
prefix: str | lib.NoDefault = lib.no_default,
@@ -935,8 +936,8 @@ def read_table(
935936
sep: str | None | lib.NoDefault = ...,
936937
delimiter: str | None | lib.NoDefault = ...,
937938
header: int | Sequence[int] | None | Literal["infer"] = ...,
938-
names=...,
939-
index_col=...,
939+
names: Sequence[Hashable] | None | lib.NoDefault = ...,
940+
index_col: IndexLabel | Literal[False] | None = ...,
940941
usecols=...,
941942
squeeze: bool | None = ...,
942943
prefix: str | lib.NoDefault = ...,
@@ -995,8 +996,8 @@ def read_table(
995996
sep: str | None | lib.NoDefault = ...,
996997
delimiter: str | None | lib.NoDefault = ...,
997998
header: int | Sequence[int] | None | Literal["infer"] = ...,
998-
names=...,
999-
index_col=...,
999+
names: Sequence[Hashable] | None | lib.NoDefault = ...,
1000+
index_col: IndexLabel | Literal[False] | None = ...,
10001001
usecols=...,
10011002
squeeze: bool | None = ...,
10021003
prefix: str | lib.NoDefault = ...,
@@ -1055,8 +1056,8 @@ def read_table(
10551056
sep: str | None | lib.NoDefault = ...,
10561057
delimiter: str | None | lib.NoDefault = ...,
10571058
header: int | Sequence[int] | None | Literal["infer"] = ...,
1058-
names=...,
1059-
index_col=...,
1059+
names: Sequence[Hashable] | None | lib.NoDefault = ...,
1060+
index_col: IndexLabel | Literal[False] | None = ...,
10601061
usecols=...,
10611062
squeeze: bool | None = ...,
10621063
prefix: str | lib.NoDefault = ...,
@@ -1115,8 +1116,8 @@ def read_table(
11151116
sep: str | None | lib.NoDefault = ...,
11161117
delimiter: str | None | lib.NoDefault = ...,
11171118
header: int | Sequence[int] | None | Literal["infer"] = ...,
1118-
names=...,
1119-
index_col=...,
1119+
names: Sequence[Hashable] | None | lib.NoDefault = ...,
1120+
index_col: IndexLabel | Literal[False] | None = ...,
11201121
usecols=...,
11211122
squeeze: bool | None = ...,
11221123
prefix: str | lib.NoDefault = ...,
@@ -1185,8 +1186,8 @@ def read_table(
11851186
delimiter: str | None | lib.NoDefault = None,
11861187
# Column and Index Locations and Names
11871188
header: int | Sequence[int] | None | Literal["infer"] = "infer",
1188-
names=lib.no_default,
1189-
index_col=None,
1189+
names: Sequence[Hashable] | None | lib.NoDefault = lib.no_default,
1190+
index_col: IndexLabel | Literal[False] | None = None,
11901191
usecols=None,
11911192
squeeze: bool | None = None,
11921193
prefix: str | lib.NoDefault = lib.no_default,
@@ -1932,7 +1933,7 @@ def _refine_defaults_read(
19321933
error_bad_lines: bool | None,
19331934
warn_bad_lines: bool | None,
19341935
on_bad_lines: str | Callable | None,
1935-
names: ArrayLike | None | lib.NoDefault,
1936+
names: Sequence[Hashable] | None | lib.NoDefault,
19361937
prefix: str | None | lib.NoDefault,
19371938
defaults: dict[str, Any],
19381939
):

0 commit comments

Comments
 (0)