@@ -28,23 +28,23 @@ def test_append(self, sort, float_frame):
28
28
begin_frame = float_frame .reindex (begin_index )
29
29
end_frame = float_frame .reindex (end_index )
30
30
31
- appended = begin_frame ._append (end_frame )
31
+ appended = begin_frame ._append_internal (end_frame )
32
32
tm .assert_almost_equal (appended ["A" ], float_frame ["A" ])
33
33
34
34
del end_frame ["A" ]
35
- partial_appended = begin_frame ._append (end_frame , sort = sort )
35
+ partial_appended = begin_frame ._append_internal (end_frame , sort = sort )
36
36
assert "A" in partial_appended
37
37
38
- partial_appended = end_frame ._append (begin_frame , sort = sort )
38
+ partial_appended = end_frame ._append_internal (begin_frame , sort = sort )
39
39
assert "A" in partial_appended
40
40
41
41
# mixed type handling
42
- appended = mixed_frame [:5 ]._append (mixed_frame [5 :])
42
+ appended = mixed_frame [:5 ]._append_internal (mixed_frame [5 :])
43
43
tm .assert_frame_equal (appended , mixed_frame )
44
44
45
45
# what to test here
46
- mixed_appended = mixed_frame [:5 ]._append (float_frame [5 :], sort = sort )
47
- mixed_appended2 = float_frame [:5 ]._append (mixed_frame [5 :], sort = sort )
46
+ mixed_appended = mixed_frame [:5 ]._append_internal (float_frame [5 :], sort = sort )
47
+ mixed_appended2 = float_frame [:5 ]._append_internal (mixed_frame [5 :], sort = sort )
48
48
49
49
# all equal except 'foo' column
50
50
tm .assert_frame_equal (
@@ -55,18 +55,18 @@ def test_append(self, sort, float_frame):
55
55
def test_append_empty (self , float_frame ):
56
56
empty = DataFrame ()
57
57
58
- appended = float_frame ._append (empty )
58
+ appended = float_frame ._append_internal (empty )
59
59
tm .assert_frame_equal (float_frame , appended )
60
60
assert appended is not float_frame
61
61
62
- appended = empty ._append (float_frame )
62
+ appended = empty ._append_internal (float_frame )
63
63
tm .assert_frame_equal (float_frame , appended )
64
64
assert appended is not float_frame
65
65
66
66
def test_append_overlap_raises (self , float_frame ):
67
67
msg = "Indexes have overlapping values"
68
68
with pytest .raises (ValueError , match = msg ):
69
- float_frame ._append (float_frame , verify_integrity = True )
69
+ float_frame ._append_internal (float_frame , verify_integrity = True )
70
70
71
71
def test_append_new_columns (self ):
72
72
# see gh-6129: new columns
@@ -79,13 +79,13 @@ def test_append_new_columns(self):
79
79
"c" : {"z" : 7 },
80
80
}
81
81
)
82
- result = df ._append (row )
82
+ result = df ._append_internal (row )
83
83
tm .assert_frame_equal (result , expected )
84
84
85
85
def test_append_length0_frame (self , sort ):
86
86
df = DataFrame (columns = ["A" , "B" , "C" ])
87
87
df3 = DataFrame (index = [0 , 1 ], columns = ["A" , "B" ])
88
- df5 = df ._append (df3 , sort = sort )
88
+ df5 = df ._append_internal (df3 , sort = sort )
89
89
90
90
expected = DataFrame (index = [0 , 1 ], columns = ["A" , "B" , "C" ])
91
91
tm .assert_frame_equal (df5 , expected )
@@ -100,7 +100,7 @@ def test_append_records(self):
100
100
df1 = DataFrame (arr1 )
101
101
df2 = DataFrame (arr2 )
102
102
103
- result = df1 ._append (df2 , ignore_index = True )
103
+ result = df1 ._append_internal (df2 , ignore_index = True )
104
104
expected = DataFrame (np .concatenate ((arr1 , arr2 )))
105
105
tm .assert_frame_equal (result , expected )
106
106
@@ -109,7 +109,7 @@ def test_append_sorts(self, sort):
109
109
df1 = DataFrame ({"a" : [1 , 2 ], "b" : [1 , 2 ]}, columns = ["b" , "a" ])
110
110
df2 = DataFrame ({"a" : [1 , 2 ], "c" : [3 , 4 ]}, index = [2 , 3 ])
111
111
112
- result = df1 ._append (df2 , sort = sort )
112
+ result = df1 ._append_internal (df2 , sort = sort )
113
113
114
114
# for None / True
115
115
expected = DataFrame (
@@ -133,7 +133,7 @@ def test_append_different_columns(self, sort):
133
133
a = df [:5 ].loc [:, ["bools" , "ints" , "floats" ]]
134
134
b = df [5 :].loc [:, ["strings" , "ints" , "floats" ]]
135
135
136
- appended = a ._append (b , sort = sort )
136
+ appended = a ._append_internal (b , sort = sort )
137
137
assert isna (appended ["strings" ][0 :4 ]).all ()
138
138
assert isna (appended ["bools" ][5 :]).all ()
139
139
@@ -145,12 +145,12 @@ def test_append_many(self, sort, float_frame):
145
145
float_frame [15 :],
146
146
]
147
147
148
- result = chunks [0 ]._append (chunks [1 :])
148
+ result = chunks [0 ]._append_internal (chunks [1 :])
149
149
tm .assert_frame_equal (result , float_frame )
150
150
151
151
chunks [- 1 ] = chunks [- 1 ].copy ()
152
152
chunks [- 1 ]["foo" ] = "bar"
153
- result = chunks [0 ]._append (chunks [1 :], sort = sort )
153
+ result = chunks [0 ]._append_internal (chunks [1 :], sort = sort )
154
154
tm .assert_frame_equal (result .loc [:, float_frame .columns ], float_frame )
155
155
assert (result ["foo" ][15 :] == "bar" ).all ()
156
156
assert result ["foo" ][:15 ].isna ().all ()
@@ -162,7 +162,7 @@ def test_append_preserve_index_name(self):
162
162
df2 = DataFrame (data = [[1 , 4 , 7 ], [2 , 5 , 8 ], [3 , 6 , 9 ]], columns = ["A" , "B" , "C" ])
163
163
df2 = df2 .set_index (["A" ])
164
164
165
- result = df1 ._append (df2 )
165
+ result = df1 ._append_internal (df2 )
166
166
assert result .index .name == "A"
167
167
168
168
indexes_can_append = [
@@ -193,7 +193,7 @@ def test_append_same_columns_type(self, index):
193
193
df = DataFrame ([[1 , 2 , 3 ], [4 , 5 , 6 ]], columns = index )
194
194
ser_index = index [:2 ]
195
195
ser = Series ([7 , 8 ], index = ser_index , name = 2 )
196
- result = df ._append (ser )
196
+ result = df ._append_internal (ser )
197
197
expected = DataFrame (
198
198
[[1 , 2 , 3.0 ], [4 , 5 , 6 ], [7 , 8 , np .nan ]], index = [0 , 1 , 2 ], columns = index
199
199
)
@@ -208,7 +208,7 @@ def test_append_same_columns_type(self, index):
208
208
index = index [:2 ]
209
209
df = DataFrame ([[1 , 2 ], [4 , 5 ]], columns = index )
210
210
ser = Series ([7 , 8 , 9 ], index = ser_index , name = 2 )
211
- result = df ._append (ser )
211
+ result = df ._append_internal (ser )
212
212
expected = DataFrame (
213
213
[[1 , 2 , np .nan ], [4 , 5 , np .nan ], [7 , 8 , 9 ]],
214
214
index = [0 , 1 , 2 ],
@@ -229,7 +229,7 @@ def test_append_different_columns_types(self, df_columns, series_index):
229
229
df = DataFrame ([[1 , 2 , 3 ], [4 , 5 , 6 ]], columns = df_columns )
230
230
ser = Series ([7 , 8 , 9 ], index = series_index , name = 2 )
231
231
232
- result = df ._append (ser )
232
+ result = df ._append_internal (ser )
233
233
idx_diff = ser .index .difference (df_columns )
234
234
combined_columns = Index (df_columns .tolist ()).append (idx_diff )
235
235
expected = DataFrame (
@@ -285,7 +285,7 @@ def test_append_dtype_coerce(self, sort):
285
285
axis = 1 ,
286
286
sort = sort ,
287
287
)
288
- result = df1 ._append (df2 , ignore_index = True , sort = sort )
288
+ result = df1 ._append_internal (df2 , ignore_index = True , sort = sort )
289
289
if sort :
290
290
expected = expected [["end_time" , "start_time" ]]
291
291
else :
@@ -297,7 +297,7 @@ def test_append_missing_column_proper_upcast(self, sort):
297
297
df1 = DataFrame ({"A" : np .array ([1 , 2 , 3 , 4 ], dtype = "i8" )})
298
298
df2 = DataFrame ({"B" : np .array ([True , False , True , False ], dtype = bool )})
299
299
300
- appended = df1 ._append (df2 , ignore_index = True , sort = sort )
300
+ appended = df1 ._append_internal (df2 , ignore_index = True , sort = sort )
301
301
assert appended ["A" ].dtype == "f8"
302
302
assert appended ["B" ].dtype == "O"
303
303
@@ -306,7 +306,7 @@ def test_append_empty_frame_to_series_with_dateutil_tz(self):
306
306
date = Timestamp ("2018-10-24 07:30:00" , tz = dateutil .tz .tzutc ())
307
307
ser = Series ({"a" : 1.0 , "b" : 2.0 , "date" : date })
308
308
df = DataFrame (columns = ["c" , "d" ])
309
- result_a = df ._append (ser , ignore_index = True )
309
+ result_a = df ._append_internal (ser , ignore_index = True )
310
310
expected = DataFrame (
311
311
[[np .nan , np .nan , 1.0 , 2.0 , date ]], columns = ["c" , "d" , "a" , "b" , "date" ]
312
312
)
@@ -320,30 +320,30 @@ def test_append_empty_frame_to_series_with_dateutil_tz(self):
320
320
)
321
321
expected ["c" ] = expected ["c" ].astype (object )
322
322
expected ["d" ] = expected ["d" ].astype (object )
323
- result_b = result_a ._append (ser , ignore_index = True )
323
+ result_b = result_a ._append_internal (ser , ignore_index = True )
324
324
tm .assert_frame_equal (result_b , expected )
325
325
326
- result = df ._append ([ser , ser ], ignore_index = True )
326
+ result = df ._append_internal ([ser , ser ], ignore_index = True )
327
327
tm .assert_frame_equal (result , expected )
328
328
329
329
def test_append_empty_tz_frame_with_datetime64ns (self ):
330
330
# https://github.com/pandas-dev/pandas/issues/35460
331
331
df = DataFrame (columns = ["a" ]).astype ("datetime64[ns, UTC]" )
332
332
333
333
# pd.NaT gets inferred as tz-naive, so append result is tz-naive
334
- result = df ._append ({"a" : pd .NaT }, ignore_index = True )
334
+ result = df ._append_internal ({"a" : pd .NaT }, ignore_index = True )
335
335
expected = DataFrame ({"a" : [pd .NaT ]}, dtype = object )
336
336
tm .assert_frame_equal (result , expected )
337
337
338
338
# also test with typed value to append
339
339
df = DataFrame (columns = ["a" ]).astype ("datetime64[ns, UTC]" )
340
340
other = Series ({"a" : pd .NaT }, dtype = "datetime64[ns]" )
341
- result = df ._append (other , ignore_index = True )
341
+ result = df ._append_internal (other , ignore_index = True )
342
342
tm .assert_frame_equal (result , expected )
343
343
344
344
# mismatched tz
345
345
other = Series ({"a" : pd .NaT }, dtype = "datetime64[ns, US/Pacific]" )
346
- result = df ._append (other , ignore_index = True )
346
+ result = df ._append_internal (other , ignore_index = True )
347
347
expected = DataFrame ({"a" : [pd .NaT ]}).astype (object )
348
348
tm .assert_frame_equal (result , expected )
349
349
@@ -356,7 +356,7 @@ def test_append_empty_frame_with_timedelta64ns_nat(self, dtype_str, val):
356
356
df = DataFrame (columns = ["a" ]).astype (dtype_str )
357
357
358
358
other = DataFrame ({"a" : [np .timedelta64 (val , "ns" )]})
359
- result = df ._append (other , ignore_index = True )
359
+ result = df ._append_internal (other , ignore_index = True )
360
360
361
361
expected = other .astype (object )
362
362
tm .assert_frame_equal (result , expected )
@@ -370,7 +370,7 @@ def test_append_frame_with_timedelta64ns_nat(self, dtype_str, val):
370
370
df = DataFrame ({"a" : pd .array ([1 ], dtype = dtype_str )})
371
371
372
372
other = DataFrame ({"a" : [np .timedelta64 (val , "ns" )]})
373
- result = df ._append (other , ignore_index = True )
373
+ result = df ._append_internal (other , ignore_index = True )
374
374
375
375
expected = DataFrame ({"a" : [df .iloc [0 , 0 ], other .iloc [0 , 0 ]]}, dtype = object )
376
376
tm .assert_frame_equal (result , expected )
0 commit comments