Skip to content

Commit 140cf4f

Browse files
author
Michael Erickson
committed
Updated for style
Signed off by: Michael Erickson <[email protected]>
1 parent 180c232 commit 140cf4f

File tree

2 files changed

+13
-8
lines changed

2 files changed

+13
-8
lines changed

swat/cas/table.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5823,8 +5823,8 @@ def drop(self, labels, axis=0, level=None, inplace=False, errors='raise'):
58235823

58245824
def drop_duplicates(self, casout, subset=[]):
58255825
'''
5826-
Remove duplicate rows from a CASTable. Optionally, consider only a subset of columns
5827-
when checking for duplicate rows.
5826+
Remove duplicate rows from a CASTable. Optionally, consider only
5827+
a subset of columns when checking for duplicate rows.
58285828
58295829
Parameters
58305830
--------
@@ -5857,10 +5857,10 @@ def drop_duplicates(self, casout, subset=[]):
58575857

58585858
# We run this aciton to drop duplicates from the original table
58595859
# It is not returned -> we have to manually grab results from casout
5860-
self.groupby(subset)._retrieve('deduplication.deduplicate', casout=casout, noDuplicateKeys=True)
5860+
self.groupby(subset)._retrieve('deduplication.deduplicate',
5861+
casout=casout, noDuplicateKeys=True)
58615862

58625863
# Fetch the output table
5863-
# out = self._retrieve('table.fetch', table={'name': casout.get('name'), 'caslib': casout.get('caslib')})['Fetch']
58645864
if isinstance(casout, CASTable):
58655865
out = casout
58665866
elif isinstance(casout, dict):

swat/tests/cas/test_table.py

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -872,7 +872,9 @@ def test_drop_duplicates(self):
872872
tbl = self.table
873873
df = self.get_cars_df()
874874
# drop duplicates for single subset
875-
tbl_dropped = tbl.drop_duplicates(casout={'replace': True, 'name':'drop-test-1'}, subset='Make')
875+
tbl_dropped = tbl.drop_duplicates(casout={'replace': True,
876+
'name': 'drop-test-1'},
877+
subset='Make')
876878
df_dropped = df.drop_duplicates(subset='Make')
877879

878880
# Equivalent to pandas in size
@@ -882,7 +884,8 @@ def test_drop_duplicates(self):
882884
self.assertEquals(tbl_dropped['Make'].nunique(), len(tbl_dropped))
883885

884886
# drop duplicates for multi-element subset
885-
tbl_dropped_multi = tbl.drop_duplicates(casout={'replace': True, 'name':'drop-test-2'},
887+
tbl_dropped_multi = tbl.drop_duplicates(casout={'replace': True,
888+
'name': 'drop-test-2'},
886889
subset=['Origin', 'Type'])
887890
df_dropped_multi = df.drop_duplicates(subset=['Origin', 'Type'])
888891

@@ -900,14 +903,16 @@ def test_drop_duplicates(self):
900903
{'name': 'Origin', 'type': 'CHAR', 'length': 6},
901904
{'name': 'DriveTrain', 'type': 'CHAR', 'length': 5}
902905
]}
903-
subset = self.s.upload_frame(fetchTable, casout={'replace': True, 'name':'drop-test-3'},
906+
subset = self.s.upload_frame(fetchTable, casout={'replace': True,
907+
'name': 'drop-test-3'},
904908
importOptions=importOptions)
905909

906910
# This table is like tbl, but with nDuplicate fully duplicate rows
907911
duplicate_table = tbl.append(subset)
908912

909913
# Drop duplicates without subset (checks all cols)
910-
tbl_dropped_all = duplicate_table.drop_duplicates(casout={'replace': True, 'name':'drop-test-4'})
914+
tbl_dropped_all = duplicate_table.drop_duplicates(casout={'replace': True,
915+
'name': 'drop-test-4'})
911916

912917
# Make sure that the correct amount of rows were dropped
913918
self.assertEquals(len(tbl), len(tbl_dropped_all))

0 commit comments

Comments
 (0)