Merge remote-tracking branch 'upstream/master' into issue-26023

pandas-dev · WillAyd · Aug 26, 2019 · Apr 8, 2019 · Apr 8, 2019 · Apr 8, 2019
commit 6701aa436cec03ed74a9d419f6f51b211d802c36
diff --git a/doc/source/whatsnew/v0.25.0.rst b/doc/source/whatsnew/v0.25.0.rst
@@ -224,7 +224,6 @@ Other enhancements
 - :class:`RangeIndex` has gained :attr:`~RangeIndex.start`, :attr:`~RangeIndex.stop`, and :attr:`~RangeIndex.step` attributes (:issue:`25710`)
 - :class:`datetime.timezone` objects are now supported as arguments to timezone methods and constructors (:issue:`25065`)
 - :meth:`DataFrame.query` and :meth:`DataFrame.eval` now supports quoting column names with backticks to refer to names with spaces (:issue:`6508`)
-- :meth:`DataFrame.to_csv` and :meth:`Series.to_csv` now support dicts as ``compression`` argument with key ``'method'`` being the compression method and others as additional compression options when the compression method is ``'zip'``. (:issue:`26023`)
 - :func:`merge_asof` now gives a more clear error message when merge keys are categoricals that are not equal (:issue:`26136`)
 - :meth:`pandas.core.window.Rolling` supports exponential (or Poisson) window type (:issue:`21303`)
 - Error message for missing required imports now includes the original import error's text (:issue:`23868`)

diff --git a/doc/source/whatsnew/v1.0.0.rst b/doc/source/whatsnew/v1.0.0.rst
@@ -206,6 +206,7 @@ ExtensionArray
 Other
 ^^^^^
 - Trying to set the ``display.precision``, ``display.max_rows`` or ``display.max_columns`` using :meth:`set_option` to anything but a ``None`` or a positive int will raise a ``ValueError`` (:issue:`23348`)
+- :meth:`DataFrame.to_csv` and :meth:`Series.to_csv` now support dicts as ``compression`` argument with key ``'method'`` being the compression method and others as additional compression options when the compression method is ``'zip'``. (:issue:`26023`)  
 
 
 .. _whatsnew_1000.contributors:

diff --git a/pandas/core/generic.py b/pandas/core/generic.py
@@ -18,6 +18,7 @@
     Set,
     Union,
 )
+from typing import Callable, Dict, FrozenSet, List, Optional, Set
 import warnings
 import weakref
 

diff --git a/pandas/io/common.py b/pandas/io/common.py
@@ -9,7 +9,7 @@
 import mmap
 import os
 import pathlib
-from typing import Any, Dict, Optional, Tuple, Type, Union
+from typing import IO, Any, AnyStr, BinaryIO, Dict, Optional, TextIO, Tuple, Type, Union
 from urllib.error import URLError  # noqa
 from urllib.parse import (  # noqa
     urlencode,
@@ -35,6 +35,8 @@
 
 from pandas._typing import FilePathOrBuffer
 
+lzma = _import_lzma()
+
 # gh-12665: Alias for now and remove later.
 CParserError = ParserError
 
@@ -287,7 +289,9 @@ def _get_compression_method(
     return compression, compression_args
 
 
-def _infer_compression(filepath_or_buffer, compression) -> Optional[str]:
+def _infer_compression(
+    filepath_or_buffer: FilePathOrBuffer, compression: Optional[str]
+) -> Optional[str]:
     """
     Get the compression method for filepath_or_buffer. If compression='infer',
     the inferred compression method is returned. Otherwise, the input
@@ -387,13 +391,12 @@ def _get_handle(
     handles : list of file-like objects
         A list of file-like object that were opened in this function.
     """
-    need_text_wrapping = (BytesIO,)  # type: Tuple[Type[BytesIO], ...]
     try:
         from s3fs import S3File
 
-        need_text_wrapping = need_text_wrapping + (S3File,)
+        need_text_wrapping = (BufferedIOBase, S3File)
     except ImportError:
-        pass
+        need_text_wrapping = BufferedIOBase
 
     handles = list()
     f = path_or_buf
-Original file line number
+Diff line change
@@ Expand Up / @@ -206,6 +206,7 @@ ExtensionArray @@
     Other
     ^^^^^
     - Trying to set the ``display.precision``, ``display.max_rows`` or ``display.max_columns`` using :meth:`set_option` to anything but a ``None`` or a positive int will raise a ``ValueError`` (:issue:`23348`)
+    - :meth:`DataFrame.to_csv` and :meth:`Series.to_csv` now support dicts as ``compression`` argument with key ``'method'`` being the compression method and others as additional compression options when the compression method is ``'zip'``. (:issue:`26023`)
     .. _whatsnew_1000.contributors:
@@ Expand Down @@