CLN: Fix merge issues

Author: Kevin Sheppard

pandas-stubs/core/frame.pyi

@@ -52,7 +52,6 @@ from pandas._typing import (
     AxisType,
     ColspaceArgType,
     CompressionOptions,
-    CSVQuoting,
     Dtype,
     DtypeNp,
     FilePath,
@@ -1918,55 +1917,6 @@ class DataFrame(NDFrame, OpsMixin):
         self, excel: _bool = ..., sep: _str | None = ..., **kwargs
     ) -> None: ...
     @overload
-    def to_csv(
-        self,
-        path_or_buf: FilePathOrBuffer | None,
-        sep: _str = ...,
-        na_rep: _str = ...,
-        float_format: _str | None = ...,
-        columns: Sequence[Hashable] | None = ...,
-        header: _bool | list[_str] = ...,
-        index: _bool = ...,
-        index_label: _bool | _str | Sequence[Hashable] | None = ...,
-        mode: _str = ...,
-        encoding: _str | None = ...,
-        compression: _str | Mapping[_str, _str] = ...,
-        quoting: CSVQuoting = ...,
-        quotechar: _str = ...,
-        line_terminator: _str | None = ...,
-        chunksize: int | None = ...,
-        date_format: _str | None = ...,
-        doublequote: _bool = ...,
-        escapechar: _str | None = ...,
-        decimal: _str = ...,
-        errors: _str = ...,
-        storage_options: dict[_str, Any] | None = ...,
-    ) -> None: ...
-    @overload
-    def to_csv(
-        self,
-        sep: _str = ...,
-        na_rep: _str = ...,
-        float_format: _str | None = ...,
-        columns: Sequence[Hashable] | None = ...,
-        header: _bool | list[_str] = ...,
-        index: _bool = ...,
-        index_label: _bool | _str | Sequence[Hashable] | None = ...,
-        mode: _str = ...,
-        encoding: _str | None = ...,
-        compression: _str | Mapping[_str, _str] = ...,
-        quoting: CSVQuoting = ...,
-        quotechar: _str = ...,
-        line_terminator: _str | None = ...,
-        chunksize: int | None = ...,
-        date_format: _str | None = ...,
-        doublequote: _bool = ...,
-        escapechar: _str | None = ...,
-        decimal: _str = ...,
-        errors: _str = ...,
-        storage_options: dict[_str, Any] | None = ...,
-    ) -> _str: ...
-    @overload
     def to_json(
         self,
         path_or_buf: FilePathOrBuffer | None,

pandas-stubs/core/generic.pyi

@@ -22,6 +22,7 @@ from pandas._typing import (
     ArrayLike,
     Axis,
     CompressionOptions,
+    CSVQuoting,
     Dtype,
     DtypeArg,
     FilePath,
@@ -234,15 +235,15 @@ class NDFrame(PandasObject, indexing.IndexingMixin):
         path_or_buf: FilePathOrBuffer,
         sep: _str = ...,
         na_rep: _str = ...,
-        float_format: _str | Callable | None = ...,
+        float_format: _str | Callable[[object], _str] | None = ...,
         columns: list[HashableT] | None = ...,
         header: _bool | list[_str] = ...,
         index: _bool = ...,
         index_label: Literal[False] | _str | list[HashableT] | None = ...,
         mode: FileWriteMode = ...,
         encoding: _str | None = ...,
         compression: CompressionOptions = ...,
-        quoting: Literal[0, 1, 2, 3] | None = ...,
+        quoting: CSVQuoting = ...,
         quotechar: _str = ...,
         line_terminator: _str | None = ...,
         chunksize: int | None = ...,
@@ -259,15 +260,15 @@ class NDFrame(PandasObject, indexing.IndexingMixin):
         path_or_buf: None = ...,
         sep: _str = ...,
         na_rep: _str = ...,
-        float_format: _str | Callable | None = ...,
+        float_format: _str | Callable[[object], _str] | None = ...,
         columns: list[HashableT] | None = ...,
         header: _bool | list[_str] = ...,
         index: _bool = ...,
         index_label: Literal[False] | _str | list[HashableT] | None = ...,
         mode: FileWriteMode = ...,
         encoding: _str | None = ...,
         compression: CompressionOptions = ...,
-        quoting: Literal[0, 1, 2, 3] | None = ...,
+        quoting: CSVQuoting = ...,
         quotechar: _str = ...,
         line_terminator: _str | None = ...,
         chunksize: int | None = ...,

pandas-stubs/io/common.pyi

@@ -15,21 +15,3 @@ class IOHandles(Generic[AnyStr]):
     def __enter__(self) -> IOHandles[AnyStr]: ...
     def __exit__(self, *args: object) -> None: ...
     def __init__(self, handle, compression, created_handles, is_wrapped) -> None: ...
-
-from typing import (
-    IO,
-    AnyStr,
-    Generic,
-)
-
-from pandas._typing import CompressionDict
-
-class IOHandles(Generic[AnyStr]):
-    handle: IO[AnyStr]
-    compression: CompressionDict
-    created_handles: list[IO[AnyStr]]
-    is_wrapped: bool
-    def close(self) -> None: ...
-    def __enter__(self) -> IOHandles[AnyStr]: ...
-    def __exit__(self, *args: object) -> None: ...
-    def __init__(self, handle, compression, created_handles, is_wrapped) -> None: ...

tests/test_io.py

@@ -377,13 +377,15 @@ def test_read_csv():
 def test_read_csv_iterator():
     with ensure_clean() as path:
         check(assert_type(DF.to_csv(path), None), type(None))
+        tfr = read_csv(path, iterator=True)
+        check(assert_type(tfr, TextFileReader), TextFileReader)
+        tfr.close()
+        tfr2 = read_csv(pathlib.Path(path), chunksize=1)
         check(
-            assert_type(read_csv(path, iterator=True), TextFileReader), TextFileReader
-        )
-        check(
-            assert_type(read_csv(pathlib.Path(path), chunksize=1), TextFileReader),
+            assert_type(tfr2, TextFileReader),
             TextFileReader,
         )
+        tfr2.close()
 
 
 def test_types_read_csv() -> None:
@@ -439,12 +441,12 @@ def test_read_table():
 def test_read_table_iterator():
     with ensure_clean() as path:
         check(assert_type(DF.to_csv(path, sep="\t"), None), type(None))
-        check(
-            assert_type(read_table(path, iterator=True), TextFileReader), TextFileReader
-        )
-        check(
-            assert_type(read_table(path, chunksize=1), TextFileReader), TextFileReader
-        )
+        tfr = read_table(path, iterator=True)
+        check(assert_type(tfr, TextFileReader), TextFileReader)
+        tfr.close()
+        tfr2 = read_table(path, chunksize=1)
+        check(assert_type(tfr2, TextFileReader), TextFileReader)
+        tfr2.close()
 
 
 def btest_read_fwf():