@@ -28,10 +28,12 @@ def test_mixing_naive_tzaware_raises(self, meth):
28
28
# GH#24569
29
29
arr = np .array ([pd .Timestamp ("2000" ), pd .Timestamp ("2000" , tz = "CET" )])
30
30
31
- msg = (
32
- "Cannot mix tz-aware with tz-naive values|"
33
- "Tz-aware datetime.datetime cannot be converted "
34
- "to datetime64 unless utc=True"
31
+ msg = "|" .join (
32
+ [
33
+ "Cannot mix tz-aware with tz-naive values" ,
34
+ "Tz-aware datetime.datetime cannot be converted "
35
+ "to datetime64 unless utc=True" ,
36
+ ]
35
37
)
36
38
37
39
for obj in [arr , arr [::- 1 ]]:
@@ -63,10 +65,10 @@ def test_bool_dtype_raises(self):
63
65
64
66
def test_copy (self ):
65
67
data = np .array ([1 , 2 , 3 ], dtype = "M8[ns]" )
66
- arr = DatetimeArray ._from_sequence (data , copy = False )
68
+ arr = DatetimeArray ._from_sequence (data , dtype = data . dtype , copy = False )
67
69
assert arr ._ndarray is data
68
70
69
- arr = DatetimeArray ._from_sequence (data , copy = True )
71
+ arr = DatetimeArray ._from_sequence (data , dtype = data . dtype , copy = True )
70
72
assert arr ._ndarray is not data
71
73
72
74
def test_numpy_datetime_unit (self , unit ):
@@ -163,7 +165,9 @@ def test_from_arrow_from_empty(unit, tz):
163
165
dtype = DatetimeTZDtype (unit = unit , tz = tz )
164
166
165
167
result = dtype .__from_arrow__ (arr )
166
- expected = DatetimeArray ._from_sequence (np .array (data , dtype = f"datetime64[{ unit } ]" ))
168
+ expected = DatetimeArray ._from_sequence (
169
+ np .array (data , dtype = f"datetime64[{ unit } ]" ), dtype = np .dtype (f"M8[{ unit } ]" )
170
+ )
167
171
expected = expected .tz_localize (tz = tz )
168
172
tm .assert_extension_array_equal (result , expected )
169
173
@@ -179,7 +183,9 @@ def test_from_arrow_from_integers():
179
183
dtype = DatetimeTZDtype (unit = "ns" , tz = "UTC" )
180
184
181
185
result = dtype .__from_arrow__ (arr )
182
- expected = DatetimeArray ._from_sequence (np .array (data , dtype = "datetime64[ns]" ))
186
+ expected = DatetimeArray ._from_sequence (
187
+ np .array (data , dtype = "datetime64[ns]" ), dtype = np .dtype ("M8[ns]" )
188
+ )
183
189
expected = expected .tz_localize ("UTC" )
184
190
tm .assert_extension_array_equal (result , expected )
185
191
0 commit comments