From 4e8bc8fb26c3aa957fd38e1ee87cd1e5528a28d7 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Tue, 3 Dec 2019 15:35:23 +0000 Subject: [PATCH 1/2] TYP: some types for pandas/io/formats/csvs.py --- pandas/io/formats/csvs.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pandas/io/formats/csvs.py b/pandas/io/formats/csvs.py index f0493036b934a..e9edb43fa7d5f 100644 --- a/pandas/io/formats/csvs.py +++ b/pandas/io/formats/csvs.py @@ -5,6 +5,7 @@ import csv as csvlib from io import StringIO import os +from typing import Any, Dict, List import warnings from zipfile import ZipFile @@ -187,7 +188,7 @@ def save(self): close = True try: - writer_kwargs = dict( + kwargs: Dict[str, Any] = dict( lineterminator=self.line_terminator, delimiter=self.sep, quoting=self.quoting, @@ -196,10 +197,9 @@ def save(self): quotechar=self.quotechar, ) if self.encoding == "ascii": - self.writer = csvlib.writer(f, **writer_kwargs) + self.writer = csvlib.writer(f, **kwargs) else: - writer_kwargs["encoding"] = self.encoding - self.writer = UnicodeWriter(f, **writer_kwargs) + self.writer = UnicodeWriter(f, encoding=self.encoding, **kwargs) self._save() @@ -233,7 +233,7 @@ def _save_header(self): cols = self.cols has_mi_columns = self.has_mi_columns header = self.header - encoded_labels = [] + encoded_labels: List[str] = [] has_aliases = isinstance(header, (tuple, list, np.ndarray, ABCIndexClass)) if not (has_aliases or self.header): From ee8a957415de48fbf0f49e74f621850cc1273f72 Mon Sep 17 00:00:00 2001 From: Simon Hawkins Date: Wed, 4 Dec 2019 19:54:17 +0000 Subject: [PATCH 2/2] update per comments --- pandas/io/formats/csvs.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pandas/io/formats/csvs.py b/pandas/io/formats/csvs.py index e9edb43fa7d5f..ae5d1d30bcddb 100644 --- a/pandas/io/formats/csvs.py +++ b/pandas/io/formats/csvs.py @@ -188,7 +188,7 @@ def save(self): close = True try: - kwargs: Dict[str, Any] = dict( + writer_kwargs: Dict[str, Any] = dict( lineterminator=self.line_terminator, delimiter=self.sep, quoting=self.quoting, @@ -197,9 +197,9 @@ def save(self): quotechar=self.quotechar, ) if self.encoding == "ascii": - self.writer = csvlib.writer(f, **kwargs) + self.writer = csvlib.writer(f, **writer_kwargs) else: - self.writer = UnicodeWriter(f, encoding=self.encoding, **kwargs) + self.writer = UnicodeWriter(f, encoding=self.encoding, **writer_kwargs) self._save()