BUG: Respect column indices for dict-like na_values

Closes gh-14203.
This commit is contained in:
gfyoung 2016-11-26 23:24:29 -05:00
parent 1439c2780b
commit cac422c892
4 changed files with 47 additions and 14 deletions

View File

@ -40,6 +40,7 @@ Bug Fixes
- Compat with ``dateutil==2.6.0``; segfault reported in the testing suite (:issue:`14621`)
- Allow ``nanoseconds`` in ``Timestamp.replace`` as a kwarg (:issue:`14621`)
- Bug in ``pd.read_csv`` in which aliasing was being done for ``na_values`` when passed in as a dictionary (:issue:`14203`)
- Bug in ``pd.read_csv`` in which column indices for a dict-like ``na_values`` were not being respected (:issue:`14203`)
- Bug in ``pd.read_csv`` where reading files fails, if the number of headers is equal to the number of lines in the file (:issue:`14515`)
- Bug in ``pd.read_csv`` for the Python engine in which an unhelpful error message was being raised when multi-char delimiters were not being respected with quotes (:issue:`14582`)
- Fix bugs (:issue:`14734`, :issue:`13654`) in ``pd.read_sas`` and ``pandas.io.sas.sas7bdat.SAS7BDATReader`` that caused problems when reading a SAS file incrementally.

View File

@ -2055,9 +2055,27 @@ class PythonParser(ParserBase):
else:
clean_dtypes = _clean_mapping(self.dtype)
return self._convert_to_ndarrays(data, self.na_values, self.na_fvalues,
self.verbose, clean_conv,
clean_dtypes)
# Apply NA values.
clean_na_values = {}
clean_na_fvalues = {}
if isinstance(self.na_values, dict):
for col in self.na_values:
na_value = self.na_values[col]
na_fvalue = self.na_fvalues[col]
if isinstance(col, int) and col not in self.orig_names:
col = self.orig_names[col]
clean_na_values[col] = na_value
clean_na_fvalues[col] = na_fvalue
else:
clean_na_values = self.na_values
clean_na_fvalues = self.na_fvalues
return self._convert_to_ndarrays(data, clean_na_values,
clean_na_fvalues, self.verbose,
clean_conv, clean_dtypes)
def _to_recarray(self, data, columns):
dtypes = []

View File

@ -279,3 +279,13 @@ nan,B
tm.assert_frame_equal(out, expected)
tm.assert_dict_equal(na_values, na_values_copy)
def test_na_values_dict_col_index(self):
# see gh-14203
data = 'a\nfoo\n1'
na_values = {0: 'foo'}
out = self.read_csv(StringIO(data), na_values=na_values)
expected = DataFrame({'a': [np.nan, 1]})
tm.assert_frame_equal(out, expected)

View File

@ -1262,19 +1262,23 @@ cdef class TextReader:
return None, set()
if isinstance(self.na_values, dict):
key = None
values = None
if name is not None and name in self.na_values:
values = self.na_values[name]
if values is not None and not isinstance(values, list):
values = list(values)
fvalues = self.na_fvalues[name]
if fvalues is not None and not isinstance(fvalues, set):
fvalues = set(fvalues)
else:
if i in self.na_values:
return self.na_values[i], self.na_fvalues[i]
else:
return _NA_VALUES, set()
key = name
elif i in self.na_values:
key = i
else: # No na_values provided for this column.
return _NA_VALUES, set()
values = self.na_values[key]
if values is not None and not isinstance(values, list):
values = list(values)
fvalues = self.na_fvalues[key]
if fvalues is not None and not isinstance(fvalues, set):
fvalues = set(fvalues)
return _ensure_encoded(values), fvalues
else: