Skip to content

Commit 940a1b4

Browse files
authored
TYP: read_csv and read_excel fixes (#55410)
1 parent e4b7174 commit 940a1b4

File tree

2 files changed

+16
-15
lines changed

2 files changed

+16
-15
lines changed

pandas/io/excel/_base.py

+6-5
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
IntStrT,
8181
ReadBuffer,
8282
Self,
83+
SequenceNotStr,
8384
StorageOptions,
8485
WriteExcelBuffer,
8586
)
@@ -387,7 +388,7 @@ def read_excel(
387388
sheet_name: str | int = ...,
388389
*,
389390
header: int | Sequence[int] | None = ...,
390-
names: list[str] | None = ...,
391+
names: SequenceNotStr[Hashable] | range | None = ...,
391392
index_col: int | Sequence[int] | None = ...,
392393
usecols: int
393394
| str
@@ -426,7 +427,7 @@ def read_excel(
426427
sheet_name: list[IntStrT] | None,
427428
*,
428429
header: int | Sequence[int] | None = ...,
429-
names: list[str] | None = ...,
430+
names: SequenceNotStr[Hashable] | range | None = ...,
430431
index_col: int | Sequence[int] | None = ...,
431432
usecols: int
432433
| str
@@ -465,7 +466,7 @@ def read_excel(
465466
sheet_name: str | int | list[IntStrT] | None = 0,
466467
*,
467468
header: int | Sequence[int] | None = 0,
468-
names: list[str] | None = None,
469+
names: SequenceNotStr[Hashable] | range | None = None,
469470
index_col: int | Sequence[int] | None = None,
470471
usecols: int
471472
| str
@@ -730,7 +731,7 @@ def parse(
730731
self,
731732
sheet_name: str | int | list[int] | list[str] | None = 0,
732733
header: int | Sequence[int] | None = 0,
733-
names=None,
734+
names: SequenceNotStr[Hashable] | range | None = None,
734735
index_col: int | Sequence[int] | None = None,
735736
usecols=None,
736737
dtype: DtypeArg | None = None,
@@ -1589,7 +1590,7 @@ def parse(
15891590
self,
15901591
sheet_name: str | int | list[int] | list[str] | None = 0,
15911592
header: int | Sequence[int] | None = 0,
1592-
names=None,
1593+
names: SequenceNotStr[Hashable] | range | None = None,
15931594
index_col: int | Sequence[int] | None = None,
15941595
usecols=None,
15951596
converters=None,

pandas/io/parsers/readers.py

+10-10
Original file line numberDiff line numberDiff line change
@@ -666,7 +666,7 @@ def read_csv(
666666
infer_datetime_format: bool | lib.NoDefault = ...,
667667
keep_date_col: bool = ...,
668668
date_parser: Callable | lib.NoDefault = ...,
669-
date_format: str | None = ...,
669+
date_format: str | dict[Hashable, str] | None = ...,
670670
dayfirst: bool = ...,
671671
cache_dates: bool = ...,
672672
iterator: Literal[True],
@@ -726,7 +726,7 @@ def read_csv(
726726
infer_datetime_format: bool | lib.NoDefault = ...,
727727
keep_date_col: bool = ...,
728728
date_parser: Callable | lib.NoDefault = ...,
729-
date_format: str | None = ...,
729+
date_format: str | dict[Hashable, str] | None = ...,
730730
dayfirst: bool = ...,
731731
cache_dates: bool = ...,
732732
iterator: bool = ...,
@@ -786,7 +786,7 @@ def read_csv(
786786
infer_datetime_format: bool | lib.NoDefault = ...,
787787
keep_date_col: bool = ...,
788788
date_parser: Callable | lib.NoDefault = ...,
789-
date_format: str | None = ...,
789+
date_format: str | dict[Hashable, str] | None = ...,
790790
dayfirst: bool = ...,
791791
cache_dates: bool = ...,
792792
iterator: Literal[False] = ...,
@@ -846,7 +846,7 @@ def read_csv(
846846
infer_datetime_format: bool | lib.NoDefault = ...,
847847
keep_date_col: bool = ...,
848848
date_parser: Callable | lib.NoDefault = ...,
849-
date_format: str | None = ...,
849+
date_format: str | dict[Hashable, str] | None = ...,
850850
dayfirst: bool = ...,
851851
cache_dates: bool = ...,
852852
iterator: bool = ...,
@@ -920,7 +920,7 @@ def read_csv(
920920
infer_datetime_format: bool | lib.NoDefault = lib.no_default,
921921
keep_date_col: bool = False,
922922
date_parser: Callable | lib.NoDefault = lib.no_default,
923-
date_format: str | None = None,
923+
date_format: str | dict[Hashable, str] | None = None,
924924
dayfirst: bool = False,
925925
cache_dates: bool = True,
926926
# Iteration
@@ -1009,7 +1009,7 @@ def read_table(
10091009
infer_datetime_format: bool | lib.NoDefault = ...,
10101010
keep_date_col: bool = ...,
10111011
date_parser: Callable | lib.NoDefault = ...,
1012-
date_format: str | None = ...,
1012+
date_format: str | dict[Hashable, str] | None = ...,
10131013
dayfirst: bool = ...,
10141014
cache_dates: bool = ...,
10151015
iterator: Literal[True],
@@ -1066,7 +1066,7 @@ def read_table(
10661066
infer_datetime_format: bool | lib.NoDefault = ...,
10671067
keep_date_col: bool = ...,
10681068
date_parser: Callable | lib.NoDefault = ...,
1069-
date_format: str | None = ...,
1069+
date_format: str | dict[Hashable, str] | None = ...,
10701070
dayfirst: bool = ...,
10711071
cache_dates: bool = ...,
10721072
iterator: bool = ...,
@@ -1123,7 +1123,7 @@ def read_table(
11231123
infer_datetime_format: bool | lib.NoDefault = ...,
11241124
keep_date_col: bool = ...,
11251125
date_parser: Callable | lib.NoDefault = ...,
1126-
date_format: str | None = ...,
1126+
date_format: str | dict[Hashable, str] | None = ...,
11271127
dayfirst: bool = ...,
11281128
cache_dates: bool = ...,
11291129
iterator: Literal[False] = ...,
@@ -1180,7 +1180,7 @@ def read_table(
11801180
infer_datetime_format: bool | lib.NoDefault = ...,
11811181
keep_date_col: bool = ...,
11821182
date_parser: Callable | lib.NoDefault = ...,
1183-
date_format: str | None = ...,
1183+
date_format: str | dict[Hashable, str] | None = ...,
11841184
dayfirst: bool = ...,
11851185
cache_dates: bool = ...,
11861186
iterator: bool = ...,
@@ -1253,7 +1253,7 @@ def read_table(
12531253
infer_datetime_format: bool | lib.NoDefault = lib.no_default,
12541254
keep_date_col: bool = False,
12551255
date_parser: Callable | lib.NoDefault = lib.no_default,
1256-
date_format: str | None = None,
1256+
date_format: str | dict[Hashable, str] | None = None,
12571257
dayfirst: bool = False,
12581258
cache_dates: bool = True,
12591259
# Iteration

0 commit comments

Comments
 (0)