Merge remote-tracking branch 'upstream/master' into jorisvandenbossch…

…e-ea-array-protocol

pandas/core/arrays/datetimes.py

@@ -523,6 +523,13 @@ def _resolution(self):
     # ----------------------------------------------------------------
     # Array-Like / EA-Interface Methods
 
+    def __array__(self, dtype=None):
+        if dtype is None and self.tz:
+            # The default for tz-aware is object, to preserve tz info
+            dtype = object
+
+        return super(DatetimeArray, self).__array__(dtype=dtype)
+
     def __iter__(self):
         """
         Return an iterator over the boxed values

pandas/tests/arrays/test_datetimelike.py

@@ -261,7 +261,7 @@ def test_array_interface(self, datetime_index):
         assert result is expected
         tm.assert_numpy_array_equal(result, expected)
         result = np.array(arr, dtype='datetime64[ns]')
-        assert not result is expected
+        assert result is not expected
         tm.assert_numpy_array_equal(result, expected)
 
         # to object dtype
@@ -538,7 +538,7 @@ def test_array_interface(self, timedelta_index):
         assert result is expected
         tm.assert_numpy_array_equal(result, expected)
         result = np.array(arr, dtype='timedelta64[ns]')
-        assert not result is expected
+        assert result is not expected
         tm.assert_numpy_array_equal(result, expected)
 
         # to object dtype