fixup

Author: TomAugspurger

pandas/core/base.py

@@ -17,7 +17,8 @@
 from pandas.core.dtypes.common import (
     is_datetime64tz_dtype, is_datetimelike, is_extension_array_dtype,
     is_extension_type, is_list_like, is_object_dtype, is_scalar)
-from pandas.core.dtypes.generic import ABCDataFrame, ABCIndexClass, ABCSeries
+from pandas.core.dtypes.generic import (
+    ABCDataFrame, ABCDatetimeArray, ABCIndexClass, ABCSeries)
 from pandas.core.dtypes.missing import isna
 
 from pandas.core import algorithms, common as com
@@ -849,9 +850,13 @@ def array(self):
         """
         result = self._values
 
-        # TODO(DatetimeArray): remvoe the second clause.
-        if (not is_extension_array_dtype(result.dtype)
-                and not is_datetime64tz_dtype(result.dtype)):
+        if not (is_extension_array_dtype(result.dtype)
+                or isinstance(result, ABCDatetimeArray)):
+            # TODO: Should this be a DatetimeArray or PandasArray
+            # for tz-naive data?
+            # DatetimeArray is a bit strange, since tz-naive
+            # arrays are an ExtensionArray, but the dtype is not
+            # an extension dtype.
             from pandas.core.arrays.numpy_ import PandasArray
 
             result = PandasArray(result)

pandas/tests/arrays/test_datetimes.py

@@ -20,7 +20,8 @@ def test_mismatched_timezone_raises(self):
         arr = DatetimeArray(np.array(['2000-01-01T06:00:00'], dtype='M8[ns]'),
                             dtype=DatetimeTZDtype(tz='US/Central'))
         dtype = DatetimeTZDtype(tz='US/Eastern')
-        with pytest.raises(TypeError, match='data is already tz-aware'):
+        # TODO: figure out error message
+        with pytest.raises(TypeError, match='Timezone of the array'):
             DatetimeArray(arr, dtype=dtype)
 
     def test_non_array_raises(self):