Skip to content

Commit 54107ac

Browse files
author
How Si Wei
committed
Reformat code with black
1 parent 6006f2c commit 54107ac

File tree

3 files changed

+52
-44
lines changed

3 files changed

+52
-44
lines changed

‎pandas/core/indexing.py

+13-6
Original file line numberDiff line numberDiff line change
@@ -318,11 +318,14 @@ def _setitem_with_indexer(self, indexer, value):
318318
# maybe partial set
319319
take_split_path = self.obj._is_mixed_type
320320

321-
if (isinstance(indexer, tuple) and len(indexer) > 1 and
322-
is_list_like_indexer(indexer[1])):
321+
if (
322+
isinstance(indexer, tuple)
323+
and len(indexer) > 1
324+
and is_list_like_indexer(indexer[1])
325+
):
323326
for i, k in enumerate(indexer[1]):
324327
if isinstance(k, dict):
325-
key = k['key']
328+
key = k["key"]
326329
self.obj[key] = np.nan
327330
indexer[1][i] = self._convert_to_indexer(key, axis=1)
328331
take_split_path = True
@@ -1284,9 +1287,13 @@ def _convert_to_indexer(
12841287
if is_setter and axis == 1:
12851288
return [
12861289
self._convert_to_indexer(
1287-
k, axis=axis, is_setter=is_setter,
1288-
raise_missing=raise_missing)
1289-
for k in obj]
1290+
k,
1291+
axis=axis,
1292+
is_setter=is_setter,
1293+
raise_missing=raise_missing,
1294+
)
1295+
for k in obj
1296+
]
12901297
raise
12911298
else:
12921299
try:

‎pandas/tests/frame/test_indexing.py

+15-15
Original file line numberDiff line numberDiff line change
@@ -211,38 +211,38 @@ def test_setitem_list_of_tuples(self, float_frame):
211211
def test_setitem_list_all_missing_columns_scalar(self, float_frame):
212212
# GH 26534
213213
result = float_frame.copy()
214-
result[['E', 'F']] = 1
214+
result[["E", "F"]] = 1
215215
expected = float_frame.copy()
216-
expected['E'] = 1
217-
expected['F'] = 1
216+
expected["E"] = 1
217+
expected["F"] = 1
218218
assert_frame_equal(result, expected)
219219

220220
def test_setitem_list_some_missing_columns_list(self, float_frame):
221221
# GH 26534
222222
result = float_frame.copy()
223-
result[['A', 'E']] = [1, 2]
223+
result[["A", "E"]] = [1, 2]
224224
expected = float_frame.copy()
225-
expected['A'] = 1
226-
expected['E'] = 2
225+
expected["A"] = 1
226+
expected["E"] = 2
227227
assert_frame_equal(result, expected)
228228

229229
def test_setitem_list_some_missing_columns_dataframe(self, float_frame):
230230
# GH 26534
231231
result = float_frame.copy()
232-
result[['A', 'E']] = float_frame[['B', 'C']]
232+
result[["A", "E"]] = float_frame[["B", "C"]]
233233
expected = float_frame.copy()
234-
expected['A'] = float_frame['B']
235-
expected['E'] = float_frame['C']
234+
expected["A"] = float_frame["B"]
235+
expected["E"] = float_frame["C"]
236236
assert_frame_equal(result, expected)
237237

238238
def test_setitem_list_some_missing_columns_2dlist(self):
239239
# GH 26534
240-
result = pd.DataFrame([[1, 2], [3, 4], [5, 6]], columns=['A', 'B'])
241-
result[['B', 'C', 'D']] = [[7, 8, 9], [10, 11, 12], [13, 14, 15]]
242-
expected = pd.DataFrame([[1, 7, 8, 9],
243-
[3, 10, 11, 12],
244-
[5, 13, 14, 15]],
245-
columns=['A', 'B', 'C', 'D'])
240+
result = pd.DataFrame([[1, 2], [3, 4], [5, 6]], columns=["A", "B"])
241+
result[["B", "C", "D"]] = [[7, 8, 9], [10, 11, 12], [13, 14, 15]]
242+
expected = pd.DataFrame(
243+
[[1, 7, 8, 9], [3, 10, 11, 12], [5, 13, 14, 15]],
244+
columns=["A", "B", "C", "D"],
245+
)
246246
tm.assert_frame_equal(result, expected)
247247

248248
def test_setitem_mulit_index(self):

‎pandas/tests/indexing/test_loc.py

+24-23
Original file line numberDiff line numberDiff line change
@@ -810,41 +810,42 @@ def test_loc_setitem_with_scalar_index(self, indexer, value):
810810

811811
def test_loc_setitem_missing_columns_scalar_index_list_value(self):
812812
# GH 26534
813-
df = pd.DataFrame([[1, 2], [3, 4], [5, 6]], columns=['A', 'B'])
814-
df.loc[1, ['C', 'D']] = [7, 8]
815-
expected = pd.DataFrame([[1, 2, np.nan, np.nan],
816-
[3, 4, 7, 8],
817-
[5, 6, np.nan, np.nan]],
818-
columns=['A', 'B', 'C', 'D'])
813+
df = pd.DataFrame([[1, 2], [3, 4], [5, 6]], columns=["A", "B"])
814+
df.loc[1, ["C", "D"]] = [7, 8]
815+
expected = pd.DataFrame(
816+
[[1, 2, np.nan, np.nan], [3, 4, 7, 8], [5, 6, np.nan, np.nan]],
817+
columns=["A", "B", "C", "D"],
818+
)
819819
tm.assert_frame_equal(df, expected)
820820

821821
def test_loc_setitem_missing_columns_full_index_dataframe_value(self):
822822
# GH 26534
823-
df = pd.DataFrame([[1, 2], [3, 4], [5, 6]], columns=['A', 'B'])
824-
df2 = pd.DataFrame([[7, 8], [9, 10], [11, 12]], columns=['A', 'C'])
825-
df.loc[:, ['A', 'C']] = df2
826-
expected = pd.DataFrame([[7, 2, 8], [9, 4, 10], [11, 6, 12]],
827-
columns=['A', 'B', 'C'])
823+
df = pd.DataFrame([[1, 2], [3, 4], [5, 6]], columns=["A", "B"])
824+
df2 = pd.DataFrame([[7, 8], [9, 10], [11, 12]], columns=["A", "C"])
825+
df.loc[:, ["A", "C"]] = df2
826+
expected = pd.DataFrame(
827+
[[7, 2, 8], [9, 4, 10], [11, 6, 12]], columns=["A", "B", "C"]
828+
)
828829
tm.assert_frame_equal(df, expected)
829830

830831
def test_loc_setitem_missing_columns_list_index_scalar_value(self):
831832
# GH 26534
832-
df = pd.DataFrame([[1, 2], [3, 4], [5, 6]], columns=['A', 'B'])
833-
df.loc[[0, 2], ['B', 'C', 'D']] = 9
834-
expected = pd.DataFrame([[1, 9, 9, 9],
835-
[3, 4, np.nan, np.nan],
836-
[5, 9, 9, 9]],
837-
columns=['A', 'B', 'C', 'D'])
833+
df = pd.DataFrame([[1, 2], [3, 4], [5, 6]], columns=["A", "B"])
834+
df.loc[[0, 2], ["B", "C", "D"]] = 9
835+
expected = pd.DataFrame(
836+
[[1, 9, 9, 9], [3, 4, np.nan, np.nan], [5, 9, 9, 9]],
837+
columns=["A", "B", "C", "D"],
838+
)
838839
tm.assert_frame_equal(df, expected)
839840

840841
def test_loc_setitem_missing_columns_range_index_2dlist_value(self):
841842
# GH 26534
842-
df = pd.DataFrame([[1, 2], [3, 4], [5, 6]], columns=['A', 'B'])
843-
df.loc[1:3, ['B', 'C', 'D']] = [[7, 8, 9], [10, 11, 12]]
844-
expected = pd.DataFrame([[1, 2, np.nan, np.nan],
845-
[3, 7, 8, 9],
846-
[5, 10, 11, 12]],
847-
columns=['A', 'B', 'C', 'D'])
843+
df = pd.DataFrame([[1, 2], [3, 4], [5, 6]], columns=["A", "B"])
844+
df.loc[1:3, ["B", "C", "D"]] = [[7, 8, 9], [10, 11, 12]]
845+
expected = pd.DataFrame(
846+
[[1, 2, np.nan, np.nan], [3, 7, 8, 9], [5, 10, 11, 12]],
847+
columns=["A", "B", "C", "D"],
848+
)
848849
tm.assert_frame_equal(df, expected)
849850

850851
def test_loc_coercion(self):

0 commit comments

Comments
 (0)