Finally cleaning up

Author: iangainey

doc/source/whatsnew/v3.0.0.rst

@@ -11,14 +11,13 @@ including other versions of pandas.
 .. ---------------------------------------------------------------------------
 .. _whatsnew_300.enhancements:
 
-
-
 Enhancements
 ~~~~~~~~~~~~
+
 .. _whatsnew_300.enhancements.read_excel_table_parameter:
 
 ``Addition of table name parameter in pandas read_excel``
-^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 Previously, when using pandas :func:`read_excel`` method the data read from Excel could not be selected in more detail than on the sheet level.
 To distinguish data that is part of a particular table in the Excel file could be tedious without the use of third party API's.
@@ -31,6 +30,7 @@ holding the data from each sheet.
  - If a table_name is specified and a sheet_name is also specified, the return with be a nested dictionary containing 2 dictionaries:
     - The first dictionary is a dictionary of DataFrames corresponding to the data on each sheet
     - The second dictionary is a dictionary of DataFrames corresponding to the data in each table
+
 .. _whatsnew_300.enhancements.enhancement1:
 
 enhancement1

pandas/io/excel/_base.py

@@ -80,7 +80,6 @@
         HashableT,
         IntStrT,
         ReadBuffer,
-        Scalar,
         Self,
         SequenceNotStr,
         StorageOptions,
@@ -431,7 +430,7 @@ def read_excel(
     skipfooter: int = ...,
     storage_options: StorageOptions = ...,
     dtype_backend: DtypeBackend | lib.NoDefault = ...,
-) -> DataFrame | list[DataFrame] | dict[str, DataFrame]: ...
+) -> DataFrame | dict[str, DataFrame] | dict[str, dict[str, DataFrame]]: ...
 
 
 @overload
@@ -472,7 +471,12 @@ def read_excel(
     skipfooter: int = ...,
     storage_options: StorageOptions = ...,
     dtype_backend: DtypeBackend | lib.NoDefault = ...,
-) -> DataFrame | dict[IntStrT, DataFrame] | dict[str, DataFrame]: ...
+) -> (
+    DataFrame
+    | dict[IntStrT, DataFrame]
+    | dict[str, DataFrame]
+    | dict[str, dict[str, DataFrame]]
+): ...
 
 
 @doc(storage_options=_shared_docs["storage_options"])
@@ -513,7 +517,12 @@ def read_excel(
     storage_options: StorageOptions | None = None,
     dtype_backend: DtypeBackend | lib.NoDefault = lib.no_default,
     engine_kwargs: dict | None = None,
-) -> DataFrame | list[DataFrame] | dict[str, DataFrame]:
+) -> (
+    DataFrame
+    | dict[IntStrT, DataFrame]
+    | dict[str, DataFrame]
+    | dict[str, dict[str, DataFrame]]
+):
     check_dtype_backend(dtype_backend)
     should_close = False
     if engine_kwargs is None:
@@ -806,6 +815,7 @@ def parse(
         # handle same-type duplicates.
         sheets = cast(Union[list[int], list[str]], list(dict.fromkeys(sheets).keys()))
 
+        output: dict[str, DataFrame] | dict[str, dict[str, DataFrame]]
         output = {"sheets": {}, "tables": {}}
         outputDict = None
 
@@ -832,7 +842,7 @@ def parse(
                 output[outputDict][asheetname] = DataFrame()
                 continue
 
-            output = self.parse_multiindex(
+            output = self.parse_data(
                 data=data,
                 asheetname=asheetname,
                 header=header,
@@ -889,7 +899,7 @@ def parse(
                             output[outputDict][atablename] = DataFrame()
                             continue
 
-                        output = self.parse_multiindex(
+                        output = self.parse_data(
                             data=table_data,
                             asheetname=atablename,
                             header=header,
@@ -932,12 +942,12 @@ def parse(
         else:
             return output["sheets"][last_sheetname]
 
-    def parse_multiindex(
+    def parse_data(
         self,
-        data: list[list[Scalar]] | None = None,
+        data: list,
+        output: dict,
         asheetname: str | int | None = None,
         header: int | Sequence[int] | None = 0,
-        output: dict | None = None,
         outputDict: str | None = None,
         names: SequenceNotStr[Hashable] | range | None = None,
         index_col: int | Sequence[int] | None = None,