31
31
)
32
32
from pandas .core .arrays import DatetimeArray
33
33
from pandas .core .tools import datetimes as tools
34
- from pandas .util import testing as tm
35
- from pandas .util .testing import assert_series_equal
34
+ import pandas .util .testing as tm
36
35
37
36
38
37
class TestTimeConversionFormats :
@@ -55,7 +54,7 @@ def test_to_datetime_format(self, cache):
55
54
expected = expecteds [i ]
56
55
57
56
if isinstance (expected , Series ):
58
- assert_series_equal (result , Series (expected ))
57
+ tm . assert_series_equal (result , Series (expected ))
59
58
elif isinstance (expected , Timestamp ):
60
59
assert result == expected
61
60
else :
@@ -67,10 +66,10 @@ def test_to_datetime_format_YYYYMMDD(self, cache):
67
66
expected = Series ([Timestamp (x ) for x in s .apply (str )])
68
67
69
68
result = to_datetime (s , format = "%Y%m%d" , cache = cache )
70
- assert_series_equal (result , expected )
69
+ tm . assert_series_equal (result , expected )
71
70
72
71
result = to_datetime (s .apply (str ), format = "%Y%m%d" , cache = cache )
73
- assert_series_equal (result , expected )
72
+ tm . assert_series_equal (result , expected )
74
73
75
74
# with NaT
76
75
expected = Series (
@@ -80,13 +79,13 @@ def test_to_datetime_format_YYYYMMDD(self, cache):
80
79
s [2 ] = np .nan
81
80
82
81
result = to_datetime (s , format = "%Y%m%d" , cache = cache )
83
- assert_series_equal (result , expected )
82
+ tm . assert_series_equal (result , expected )
84
83
85
84
# string with NaT
86
85
s = s .apply (str )
87
86
s [2 ] = "nat"
88
87
result = to_datetime (s , format = "%Y%m%d" , cache = cache )
89
- assert_series_equal (result , expected )
88
+ tm . assert_series_equal (result , expected )
90
89
91
90
# coercion
92
91
# GH 7930
@@ -131,7 +130,7 @@ def test_to_datetime_format_YYYYMMDD_overflow(self, input_s, expected):
131
130
# GH 25512
132
131
# format='%Y%m%d', errors='coerce'
133
132
result = pd .to_datetime (input_s , format = "%Y%m%d" , errors = "coerce" )
134
- assert_series_equal (result , expected )
133
+ tm . assert_series_equal (result , expected )
135
134
136
135
@pytest .mark .parametrize ("cache" , [True , False ])
137
136
def test_to_datetime_format_integer (self , cache ):
@@ -140,13 +139,13 @@ def test_to_datetime_format_integer(self, cache):
140
139
expected = Series ([Timestamp (x ) for x in s .apply (str )])
141
140
142
141
result = to_datetime (s , format = "%Y" , cache = cache )
143
- assert_series_equal (result , expected )
142
+ tm . assert_series_equal (result , expected )
144
143
145
144
s = Series ([200001 , 200105 , 200206 ])
146
145
expected = Series ([Timestamp (x [:4 ] + "-" + x [4 :]) for x in s .apply (str )])
147
146
148
147
result = to_datetime (s , format = "%Y%m" , cache = cache )
149
- assert_series_equal (result , expected )
148
+ tm . assert_series_equal (result , expected )
150
149
151
150
@pytest .mark .parametrize (
152
151
"int_date, expected" ,
@@ -216,7 +215,7 @@ def test_to_datetime_with_non_exact(self, cache):
216
215
expected = to_datetime (
217
216
s .str .extract (r"(\d+\w+\d+)" , expand = False ), format = "%d%b%y" , cache = cache
218
217
)
219
- assert_series_equal (result , expected )
218
+ tm . assert_series_equal (result , expected )
220
219
221
220
@pytest .mark .parametrize ("cache" , [True , False ])
222
221
def test_parse_nanoseconds_with_formula (self , cache ):
@@ -1204,11 +1203,11 @@ def test_dataframe(self, cache):
1204
1203
expected = Series (
1205
1204
[Timestamp ("20150204 00:00:00" ), Timestamp ("20160305 00:0:00" )]
1206
1205
)
1207
- assert_series_equal (result , expected )
1206
+ tm . assert_series_equal (result , expected )
1208
1207
1209
1208
# dict-like
1210
1209
result = to_datetime (df [["year" , "month" , "day" ]].to_dict (), cache = cache )
1211
- assert_series_equal (result , expected )
1210
+ tm . assert_series_equal (result , expected )
1212
1211
1213
1212
# dict but with constructable
1214
1213
df2 = df [["year" , "month" , "day" ]].to_dict ()
@@ -1217,7 +1216,7 @@ def test_dataframe(self, cache):
1217
1216
expected2 = Series (
1218
1217
[Timestamp ("20150204 00:00:00" ), Timestamp ("20160205 00:0:00" )]
1219
1218
)
1220
- assert_series_equal (result , expected2 )
1219
+ tm . assert_series_equal (result , expected2 )
1221
1220
1222
1221
# unit mappings
1223
1222
units = [
@@ -1244,7 +1243,7 @@ def test_dataframe(self, cache):
1244
1243
expected = Series (
1245
1244
[Timestamp ("20150204 06:58:10" ), Timestamp ("20160305 07:59:11" )]
1246
1245
)
1247
- assert_series_equal (result , expected )
1246
+ tm . assert_series_equal (result , expected )
1248
1247
1249
1248
d = {
1250
1249
"year" : "year" ,
@@ -1265,11 +1264,11 @@ def test_dataframe(self, cache):
1265
1264
Timestamp ("20160305 07:59:11.001002003" ),
1266
1265
]
1267
1266
)
1268
- assert_series_equal (result , expected )
1267
+ tm . assert_series_equal (result , expected )
1269
1268
1270
1269
# coerce back to int
1271
1270
result = to_datetime (df .astype (str ), cache = cache )
1272
- assert_series_equal (result , expected )
1271
+ tm . assert_series_equal (result , expected )
1273
1272
1274
1273
# passing coerce
1275
1274
df2 = DataFrame ({"year" : [2015 , 2016 ], "month" : [2 , 20 ], "day" : [4 , 5 ]})
@@ -1282,7 +1281,7 @@ def test_dataframe(self, cache):
1282
1281
to_datetime (df2 , cache = cache )
1283
1282
result = to_datetime (df2 , errors = "coerce" , cache = cache )
1284
1283
expected = Series ([Timestamp ("20150204 00:00:00" ), NaT ])
1285
- assert_series_equal (result , expected )
1284
+ tm . assert_series_equal (result , expected )
1286
1285
1287
1286
# extra columns
1288
1287
msg = "extra keys have been passed to the datetime assemblage: " r"\[foo\]"
@@ -1330,7 +1329,7 @@ def test_dataframe_dtypes(self, cache):
1330
1329
expected = Series (
1331
1330
[Timestamp ("20150204 00:00:00" ), Timestamp ("20160305 00:00:00" )]
1332
1331
)
1333
- assert_series_equal (result , expected )
1332
+ tm . assert_series_equal (result , expected )
1334
1333
1335
1334
# mixed dtypes
1336
1335
df ["month" ] = df ["month" ].astype ("int8" )
@@ -1339,7 +1338,7 @@ def test_dataframe_dtypes(self, cache):
1339
1338
expected = Series (
1340
1339
[Timestamp ("20150204 00:00:00" ), Timestamp ("20160305 00:00:00" )]
1341
1340
)
1342
- assert_series_equal (result , expected )
1341
+ tm . assert_series_equal (result , expected )
1343
1342
1344
1343
# float
1345
1344
df = DataFrame ({"year" : [2000 , 2001 ], "month" : [1.5 , 1 ], "day" : [1 , 1 ]})
@@ -1434,7 +1433,7 @@ def test_to_datetime_with_apply(self, cache):
1434
1433
td = Series (["May 04" , "Jun 02" , "Dec 11" ], index = [1 , 2 , 3 ])
1435
1434
expected = pd .to_datetime (td , format = "%b %y" , cache = cache )
1436
1435
result = td .apply (pd .to_datetime , format = "%b %y" , cache = cache )
1437
- assert_series_equal (result , expected )
1436
+ tm . assert_series_equal (result , expected )
1438
1437
1439
1438
td = pd .Series (["May 04" , "Jun 02" , "" ], index = [1 , 2 , 3 ])
1440
1439
msg = r"time data '' does not match format '%b %y' \(match\)"
@@ -1447,7 +1446,7 @@ def test_to_datetime_with_apply(self, cache):
1447
1446
result = td .apply (
1448
1447
lambda x : pd .to_datetime (x , format = "%b %y" , errors = "coerce" , cache = cache )
1449
1448
)
1450
- assert_series_equal (result , expected )
1449
+ tm . assert_series_equal (result , expected )
1451
1450
1452
1451
@pytest .mark .parametrize ("cache" , [True , False ])
1453
1452
def test_to_datetime_types (self , cache ):
@@ -1584,10 +1583,10 @@ def test_string_na_nat_conversion(self, cache):
1584
1583
else :
1585
1584
expected [i ] = to_datetime (x , cache = cache )
1586
1585
1587
- assert_series_equal (result , expected , check_names = False )
1586
+ tm . assert_series_equal (result , expected , check_names = False )
1588
1587
assert result .name == "foo"
1589
1588
1590
- assert_series_equal (dresult , expected , check_names = False )
1589
+ tm . assert_series_equal (dresult , expected , check_names = False )
1591
1590
assert dresult .name == "foo"
1592
1591
1593
1592
@pytest .mark .parametrize (
@@ -2158,20 +2157,20 @@ def test_to_basic(self, julian_dates):
2158
2157
expected = Series (
2159
2158
pd .to_datetime (julian_dates - pd .Timestamp (0 ).to_julian_date (), unit = "D" )
2160
2159
)
2161
- assert_series_equal (result , expected )
2160
+ tm . assert_series_equal (result , expected )
2162
2161
2163
2162
result = Series (pd .to_datetime ([0 , 1 , 2 ], unit = "D" , origin = "unix" ))
2164
2163
expected = Series (
2165
2164
[Timestamp ("1970-01-01" ), Timestamp ("1970-01-02" ), Timestamp ("1970-01-03" )]
2166
2165
)
2167
- assert_series_equal (result , expected )
2166
+ tm . assert_series_equal (result , expected )
2168
2167
2169
2168
# default
2170
2169
result = Series (pd .to_datetime ([0 , 1 , 2 ], unit = "D" ))
2171
2170
expected = Series (
2172
2171
[Timestamp ("1970-01-01" ), Timestamp ("1970-01-02" ), Timestamp ("1970-01-03" )]
2173
2172
)
2174
- assert_series_equal (result , expected )
2173
+ tm . assert_series_equal (result , expected )
2175
2174
2176
2175
def test_julian_round_trip (self ):
2177
2176
result = pd .to_datetime (2456658 , origin = "julian" , unit = "D" )
@@ -2204,7 +2203,7 @@ def test_epoch(self, units, epochs, epoch_1960, units_from_epochs):
2204
2203
)
2205
2204
2206
2205
result = Series (pd .to_datetime (units_from_epochs , unit = units , origin = epochs ))
2207
- assert_series_equal (result , expected )
2206
+ tm . assert_series_equal (result , expected )
2208
2207
2209
2208
@pytest .mark .parametrize (
2210
2209
"origin, exc" ,
0 commit comments