Skip to content

Commit

Permalink
Merge pull request #1 from JoshuaC3/clean_names-multiindex
Browse files Browse the repository at this point in the history
Fix formatting errors.
  • Loading branch information
JoshuaC3 committed Mar 22, 2018
2 parents f98934a + b401d8b commit d292b05
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 7 deletions.
6 changes: 3 additions & 3 deletions janitor/functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@ def clean_names(df):
:returns: A pandas DataFrame.
"""
df = df.rename(
columns=lambda x: x.lower()
.replace(' ', '_')
columns=lambda x: x.lower()
.replace(' ', '_')
.replace('/', '_')
.replace(':', '_')
.replace("'", '')
Expand All @@ -45,7 +45,7 @@ def clean_names(df):
.replace(')', '_')
.replace('.', '_')
)

df = df.rename(columns=lambda x: re.sub('_+', '_', x))
return df

Expand Down
7 changes: 3 additions & 4 deletions tests/test_functions.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ def test_multiindex_clean_names_functional(multiindex_dataframe):
]

labels = [[1, 0, 2], [1, 0, 2]]

expected_columns = pd.MultiIndex(levels=levels, labels=labels)
assert set(df.columns) == set(expected_columns)

Expand All @@ -142,7 +142,7 @@ def test_multiindex_clean_names_method_chain(multiindex_dataframe):
]

labels = [[0, 1, 2], [0, 1, 2]]

expected_columns = pd.MultiIndex(levels=levels, labels=labels)
assert set(df.columns) == set(expected_columns)

Expand All @@ -156,7 +156,6 @@ def test_multiindex_clean_names_pipe(multiindex_dataframe):
]

labels = [[0, 1, 2], [0, 1, 2]]

expected_columns = pd.MultiIndex(levels=levels, labels=labels)
assert set(df.columns) == set(expected_columns)

0 comments on commit d292b05

Please sign in to comment.