Skip to content

Commit

Permalink
lint
Browse files Browse the repository at this point in the history
  • Loading branch information
Ben Kandel committed Nov 22, 2016
1 parent fedfff8 commit e6b1237
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 6 deletions.
10 changes: 6 additions & 4 deletions pandas/io/parsers.py
Original file line number Diff line number Diff line change
Expand Up @@ -1512,7 +1512,8 @@ def read(self, nrows=None):
index, columns, col_dict = _get_empty_meta(
names, self.index_col, self.index_names,
dtype=self.kwds.get('dtype'))
columns = self._maybe_make_multi_index_columns(columns, self.col_names)
columns = self._maybe_make_multi_index_columns(
columns, self.col_names)

if self.usecols is not None:
columns = self._filter_usecols(columns)
Expand Down Expand Up @@ -1979,9 +1980,10 @@ def read(self, rows=None):
if not len(content): # pragma: no cover
# DataFrame with the right metadata, even though it's length 0
names = self._maybe_dedup_names(self.orig_names)
index, columns, col_dict = _get_empty_meta(names, self.index_col,
self.index_names)
columns = self._maybe_make_multi_index_columns(columns, self.col_names)
index, columns, col_dict = _get_empty_meta(
names, self.index_col, self.index_names)
columns = self._maybe_make_multi_index_columns(
columns, self.col_names)
return index, columns, col_dict

# handle new style for names in index
Expand Down
3 changes: 1 addition & 2 deletions pandas/io/tests/parser/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -621,14 +621,13 @@ def test_multi_index_blank_df(self):
c,d
"""
df2 = self.read_csv(StringIO(data_multiline), header=[0, 1])
cols = MultiIndex.from_tuples([('a','c'), ('b', 'd')])
cols = MultiIndex.from_tuples([('a', 'c'), ('b', 'd')])
expected2 = DataFrame(columns=cols)
tm.assert_frame_equal(df2, expected2)
round_trip = self.read_csv(StringIO(
expected2.to_csv(index=False)), header=[0, 1])
tm.assert_frame_equal(round_trip, expected2)


def test_no_unnamed_index(self):
data = """ id c0 c1 c2
0 1 0 a b
Expand Down

0 comments on commit e6b1237

Please sign in to comment.