Skip to content

Commit ecd6f02

Browse files
ScorpilScorpil
committed
CLN: clean up lint errors
1 parent 08c3f71 commit ecd6f02

File tree

2 files changed

+88
-29
lines changed

2 files changed

+88
-29
lines changed

‎pandas/core/reshape/reshape.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -851,7 +851,9 @@ def check_len(item, name):
851851
result = concat(with_dummies, axis=1)
852852
else:
853853
result = _get_dummies_1d(data, prefix, prefix_sep, dummy_na,
854-
sparse=sparse, drop_first=drop_first, dtype=dtype)
854+
sparse=sparse,
855+
drop_first=drop_first,
856+
dtype=dtype)
855857
return result
856858

857859

‎pandas/tests/reshape/test_reshape.py

Lines changed: 85 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -236,12 +236,17 @@ def test_basic(self):
236236
expected = DataFrame({'a': [1, 0, 0],
237237
'b': [0, 1, 0],
238238
'c': [0, 0, 1]}, dtype=self.dtype)
239-
assert_frame_equal(get_dummies(s_list, sparse=self.sparse, dtype=self.dtype), expected)
240-
assert_frame_equal(get_dummies(s_series, sparse=self.sparse, dtype=self.dtype), expected)
239+
result = get_dummies(s_list, sparse=self.sparse, dtype=self.dtype)
240+
assert_frame_equal(result, expected)
241+
242+
result = get_dummies(s_series, sparse=self.sparse, dtype=self.dtype)
243+
assert_frame_equal(result, expected)
241244

242245
expected.index = list('ABC')
243-
assert_frame_equal(
244-
get_dummies(s_series_index, sparse=self.sparse, dtype=self.dtype), expected)
246+
result = get_dummies(s_series_index,
247+
sparse=self.sparse,
248+
dtype=self.dtype)
249+
assert_frame_equal(result, expected)
245250

246251
def test_basic_types(self):
247252
# GH 10531
@@ -268,13 +273,22 @@ def test_basic_types(self):
268273
result = get_dummies(s_series, sparse=self.sparse, dtype=self.dtype)
269274
compare(result, expected)
270275

271-
result = get_dummies(s_df, sparse=self.sparse, columns=s_df.columns, dtype=self.dtype)
276+
result = get_dummies(s_df,
277+
sparse=self.sparse,
278+
columns=s_df.columns,
279+
dtype=self.dtype)
272280
tm.assert_series_equal(result.get_dtype_counts(),
273281
Series({self.dtype_str: 8}))
274282

275-
result = get_dummies(s_df, sparse=self.sparse, columns=['a'], dtype=self.dtype)
276-
expected = Series({self.dtype_str: 3, 'int64': 1, 'object': 1}).sort_values()
277-
tm.assert_series_equal(result.get_dtype_counts().sort_values(), expected)
283+
result = get_dummies(s_df,
284+
sparse=self.sparse,
285+
columns=['a'],
286+
dtype=self.dtype)
287+
expected = Series({self.dtype_str: 3,
288+
'int64': 1,
289+
'object': 1}).sort_values()
290+
tm.assert_series_equal(result.get_dtype_counts().sort_values(),
291+
expected)
278292

279293
def test_just_na(self):
280294
just_na_list = [np.nan]
@@ -302,7 +316,10 @@ def test_include_na(self):
302316
assert_frame_equal(res, exp)
303317

304318
# Sparse dataframes do not allow nan labelled columns, see #GH8822
305-
res_na = get_dummies(s, dummy_na=True, sparse=self.sparse, dtype=self.dtype)
319+
res_na = get_dummies(s,
320+
dummy_na=True,
321+
sparse=self.sparse,
322+
dtype=self.dtype)
306323
exp_na = DataFrame({nan: {0: 0, 1: 0, 2: 1},
307324
'a': {0: 1, 1: 0, 2: 0},
308325
'b': {0: 0, 1: 1, 2: 0}},
@@ -312,7 +329,10 @@ def test_include_na(self):
312329
exp_na.columns = res_na.columns
313330
assert_frame_equal(res_na, exp_na)
314331

315-
res_just_na = get_dummies([nan], dummy_na=True, sparse=self.sparse, dtype=self.dtype)
332+
res_just_na = get_dummies([nan],
333+
dummy_na=True,
334+
sparse=self.sparse,
335+
dtype=self.dtype)
316336
exp_just_na = DataFrame(Series(1, index=[0]), columns=[nan],
317337
dtype=self.dtype)
318338
tm.assert_numpy_array_equal(res_just_na.values, exp_just_na.values)
@@ -323,7 +343,10 @@ def test_unicode(self
323343
e = 'e'
324344
eacute = unicodedata.lookup('LATIN SMALL LETTER E WITH ACUTE')
325345
s = [e, eacute, eacute]
326-
res = get_dummies(s, prefix='letter', sparse=self.sparse, dtype=self.dtype)
346+
res = get_dummies(s,
347+
prefix='letter',
348+
sparse=self.sparse,
349+
dtype=self.dtype)
327350
exp = DataFrame({'letter_e': {0: 1,
328351
1: 0,
329352
2: 0},
@@ -360,21 +383,26 @@ def test_dataframe_dummies_prefix_list(self):
360383
df = DataFrame({'A': ['a', 'b', 'a'],
361384
'B': ['b', 'b', 'c'],
362385
'C': [1, 2, 3]}, dtype=self.dtype)
363-
result = get_dummies(df, prefix=prefixes, sparse=self.sparse, dtype=self.dtype)
386+
result = get_dummies(df,
387+
prefix=prefixes,
388+
sparse=self.sparse,
389+
dtype=self.dtype)
364390
expected = DataFrame({'C': [1, 2, 3],
365391
'from_A_a': [1, 0, 1],
366392
'from_A_b': [0, 1, 0],
367393
'from_B_b': [1, 1, 0],
368394
'from_B_c': [0, 0, 1]}, dtype=self.dtype)
369395
cols = expected.columns[1:]
370396
expected[cols] = expected[cols].astype(self.dtype)
371-
expected = expected[['C', 'from_A_a', 'from_A_b', 'from_B_b', 'from_B_c']]
397+
expected = expected[['C', 'from_A_a', 'from_A_b',
398+
'from_B_b', 'from_B_c']]
372399
assert_frame_equal(result, expected)
373400

374401
def test_dataframe_dummies_prefix_str(self):
375402
# not that you should do this...
376403
df = self.df
377-
result = get_dummies(df, prefix='bad', sparse=self.sparse, dtype=self.dtype)
404+
result = get_dummies(df, prefix='bad', sparse=self.sparse,
405+
dtype=self.dtype)
378406
expected = DataFrame([[1, 1, 0, 1, 0],
379407
[2, 0, 1, 1, 0],
380408
[3, 1, 0, 0, 1]],
@@ -397,7 +425,8 @@ def test_dataframe_dummies_subset(self):
397425

398426
def test_dataframe_dummies_prefix_sep(self):
399427
df = self.df
400-
result = get_dummies(df, prefix_sep='..', sparse=self.sparse, dtype=self.dtype)
428+
result = get_dummies(df, prefix_sep='..', sparse=self.sparse,
429+
dtype=self.dtype)
401430
expected = DataFrame({'C': [1, 2, 3],
402431
'A..a': [1, 0, 1],
403432
'A..b': [0, 1, 0],
@@ -408,12 +437,17 @@ def test_dataframe_dummies_prefix_sep(self):
408437
expected[cols] = expected[cols].astype(self.dtype)
409438
assert_frame_equal(result, expected)
410439

411-
result = get_dummies(df, prefix_sep=['..', '__'], sparse=self.sparse, dtype=self.dtype)
440+
result = get_dummies(df,
441+
prefix_sep=['..', '__'],
442+
sparse=self.sparse,
443+
dtype=self.dtype)
412444
expected = expected.rename(columns={'B..b': 'B__b', 'B..c': 'B__c'})
413445
assert_frame_equal(result, expected)
414446

415447
result = get_dummies(df, prefix_sep={'A': '..',
416-
'B': '__'}, sparse=self.sparse, dtype=self.dtype)
448+
'B': '__'},
449+
sparse=self.sparse,
450+
dtype=self.dtype)
417451
assert_frame_equal(result, expected)
418452

419453
def test_dataframe_dummies_prefix_bad_length(self):
@@ -429,7 +463,8 @@ def test_dataframe_dummies_prefix_dict(self):
429463
df = DataFrame({'A': ['a', 'b', 'a'],
430464
'B': ['b', 'b', 'c'],
431465
'C': [1, 2, 3]}, dtype=self.dtype)
432-
result = get_dummies(df, prefix=prefixes, sparse=self.sparse, dtype=self.dtype)
466+
result = get_dummies(df, prefix=prefixes, sparse=self.sparse,
467+
dtype=self.dtype)
433468
expected = DataFrame({'from_A_a': [1, 0, 1],
434469
'from_A_b': [0, 1, 0],
435470
'from_B_b': [1, 1, 0],
@@ -440,7 +475,8 @@ def test_dataframe_dummies_prefix_dict(self):
440475
def test_dataframe_dummies_with_na(self):
441476
df = self.df
442477
df.loc[3, :] = [np.nan, np.nan, np.nan]
443-
result = get_dummies(df, dummy_na=True, sparse=self.sparse, dtype=self.dtype)
478+
result = get_dummies(df, dummy_na=True, sparse=self.sparse,
479+
dtype=self.dtype)
444480
expected = DataFrame({'C': [1, 2, 3, np.nan],
445481
'A_a': [1, 0, 1, 0],
446482
'A_b': [0, 1, 0, 0],
@@ -449,10 +485,12 @@ def test_dataframe_dummies_with_na(self):
449485
'B_c': [0, 0, 1, 0],
450486
'B_nan': [0, 0, 0, 1]}, dtype=self.dtype)
451487
expected[['C']] = expected[['C']].astype(np.float64)
452-
expected = expected[['C', 'A_a', 'A_b', 'A_nan', 'B_b', 'B_c', 'B_nan']]
488+
expected = expected[['C', 'A_a', 'A_b', 'A_nan',
489+
'B_b', 'B_c', 'B_nan']]
453490
assert_frame_equal(result, expected)
454491

455-
result = get_dummies(df, dummy_na=False, sparse=self.sparse, dtype=self.dtype)
492+
result = get_dummies(df, dummy_na=False, sparse=self.sparse,
493+
dtype=self.dtype)
456494
expected = expected[['C', 'A_a', 'A_b', 'B_b', 'B_c']]
457495
assert_frame_equal(result, expected)
458496

@@ -467,7 +505,6 @@ def test_dataframe_dummies_with_categorical(self):
467505
'B_c': [0, 0, 1],
468506
'cat_x': [1, 0, 0],
469507
'cat_y': [0, 1, 1]}, dtype=self.dtype)
470-
cols = ['A_a', 'A_b', 'B_b', 'B_c', 'cat_x', 'cat_y']
471508
expected = expected[['C', 'A_a', 'A_b', 'B_b', 'B_c',
472509
'cat_x', 'cat_y']]
473510
assert_frame_equal(result, expected)
@@ -482,10 +519,16 @@ def test_basic_drop_first(self):
482519
expected = DataFrame({'b': [0, 1, 0],
483520
'c': [0, 0, 1]}, dtype=self.dtype)
484521

485-
result = get_dummies(s_list, sparse=self.sparse, drop_first=True, dtype=self.dtype)
522+
result = get_dummies(s_list,
523+
sparse=self.sparse,
524+
drop_first=True,
525+
dtype=self.dtype)
486526
assert_frame_equal(result, expected)
487527

488-
result = get_dummies(s_series, sparse=self.sparse, drop_first=True, dtype=self.dtype)
528+
result = get_dummies(s_series,
529+
sparse=self.sparse,
530+
drop_first=True,
531+
dtype=self.dtype)
489532
assert_frame_equal(result, expected)
490533

491534
expected.index = list('ABC')
@@ -515,7 +558,10 @@ def test_basic_drop_first_one_level(self):
515558
def test_basic_drop_first_NA(self):
516559
# Test NA hadling together with drop_first
517560
s_NA = ['a', 'b', np.nan]
518-
res = get_dummies(s_NA, sparse=self.sparse, drop_first=True, dtype=self.dtype)
561+
res = get_dummies(s_NA,
562+
sparse=self.sparse,
563+
drop_first=True,
564+
dtype=self.dtype)
519565
exp = DataFrame({'b': [0, 1, 0]}, dtype=self.dtype)
520566
assert_frame_equal(res, exp)
521567

@@ -533,15 +579,21 @@ def test_basic_drop_first_NA(self):
533579

534580
def test_dataframe_dummies_drop_first(self):
535581
df = self.df[['A', 'B']]
536-
result = get_dummies(df, sparse=self.sparse, drop_first=True, dtype=self.dtype)
582+
result = get_dummies(df,
583+
sparse=self.sparse,
584+
drop_first=True,
585+
dtype=self.dtype)
537586
expected = DataFrame({'A_b': [0, 1, 0],
538587
'B_c': [0, 0, 1]}, dtype=self.dtype)
539588
assert_frame_equal(result, expected)
540589

541590
def test_dataframe_dummies_drop_first_with_categorical(self):
542591
df = self.df
543592
df['cat'] = pd.Categorical(['x', 'y', 'y'])
544-
result = get_dummies(df, sparse=self.sparse, drop_first=True, dtype=self.dtype)
593+
result = get_dummies(df,
594+
sparse=self.sparse,
595+
drop_first=True,
596+
dtype=self.dtype)
545597
expected = DataFrame({'C': [1, 2, 3],
546598
'A_b': [0, 1, 0],
547599
'B_c': [0, 0, 1],
@@ -633,6 +685,7 @@ class TestGetDummiesSparse(TestGetDummies):
633685
def test_include_na(self):
634686
super(TestGetDummiesSparse, self).test_include_na()
635687

688+
636689
class TestGetDummiesDtypeMixin(object):
637690
dtype_str = 'float64'
638691

@@ -652,12 +705,16 @@ def test_dataframe_dummies_prefix_sep_bad_length(self):
652705
def test_basic_drop_first_one_level(self):
653706
pass
654707

708+
655709
class TestGetDummiesDtypeFloat(TestGetDummiesDtypeMixin, TestGetDummies):
656710
pass
657711

658-
class TestGetDummiesSparseDtypeFloat(TestGetDummiesDtypeMixin, TestGetDummiesSparse):
712+
713+
class TestGetDummiesSparseDtypeFloat(TestGetDummiesDtypeMixin,
714+
TestGetDummiesSparse):
659715
pass
660716

717+
661718
class TestMakeAxisDummies(object):
662719

663720
def test_preserve_categorical_dtype(self):

0 commit comments

Comments
 (0)