Merge branch 'AHLRAP-3081' of https://github.com/prossahl/pandas into prossahl-AHLRAP-3081

Author: jreback

doc/source/release.rst

@@ -417,6 +417,7 @@ Bug Fixes
     - reading from a store with duplicate columns across dtypes would raise (:issue:`4767`)
     - Fixed a bug where ``ValueError`` wasn't correctly raised when column names
       weren't strings (:issue:`4956`)
+    - A zero length series written in Fixed format not deserializing properly. (:issue:`4708`)
   - Fixed bug in tslib.tz_convert(vals, tz1, tz2): it could raise IndexError exception while
     trying to access trans[pos + 1] (:issue:`4496`)
   - The ``by`` argument now works correctly with the ``layout`` argument

pandas/io/pytables.py

@@ -2213,6 +2213,11 @@ def read_multi_index(self, key):
 
     def read_index_node(self, node):
         data = node[:]
+        # If the index was an empty array write_array_empty() will
+        # have written a sentinel. Here we relace it with the original.
+        if 'shape' in node._v_attrs \
+        and self._is_empty_array(getattr(node._v_attrs, 'shape')):
+            data = np.empty(getattr(node._v_attrs, 'shape'), dtype=getattr(node._v_attrs, 'value_type'))
         kind = _ensure_decoded(node._v_attrs.kind)
         name = None
 
@@ -2251,12 +2256,16 @@ def write_array_empty(self, key, value):
         getattr(self.group, key)._v_attrs.value_type = str(value.dtype)
         getattr(self.group, key)._v_attrs.shape = value.shape
 
+    def _is_empty_array(self, shape):
+        """Returns true if any axis is zero length."""
+        return any(x == 0 for x in shape)
+
     def write_array(self, key, value, items=None):
         if key in self.group:
             self._handle.removeNode(self.group, key)
 
         # Transform needed to interface with pytables row/col notation
-        empty_array = any(x == 0 for x in value.shape)
+        empty_array = self._is_empty_array(value.shape)
         transposed = False
 
         if not empty_array:
@@ -2305,17 +2314,18 @@ def write_array(self, key, value, items=None):
             vlarr = self._handle.createVLArray(self.group, key,
                                                _tables().ObjectAtom())
             vlarr.append(value)
-        elif value.dtype.type == np.datetime64:
-            self._handle.createArray(self.group, key, value.view('i8'))
-            getattr(self.group, key)._v_attrs.value_type = 'datetime64'
-        elif value.dtype.type == np.timedelta64:
-            self._handle.createArray(self.group, key, value.view('i8'))
-            getattr(self.group, key)._v_attrs.value_type = 'timedelta64'
         else:
             if empty_array:
                 self.write_array_empty(key, value)
             else:
-                self._handle.createArray(self.group, key, value)
+                if value.dtype.type == np.datetime64:
+                    self._handle.createArray(self.group, key, value.view('i8'))
+                    getattr(self.group, key)._v_attrs.value_type = 'datetime64'
+                elif value.dtype.type == np.timedelta64:
+                    self._handle.createArray(self.group, key, value.view('i8'))
+                    getattr(self.group, key)._v_attrs.value_type = 'timedelta64'
+                else:
+                    self._handle.createArray(self.group, key, value)
 
         getattr(self.group, key)._v_attrs.transposed = transposed
 
@@ -2362,11 +2372,7 @@ def shape(self):
     def read(self, **kwargs):
         self.validate_read(kwargs)
         index = self.read_index('index')
-        if len(index) > 0:
-            values = self.read_array('values')
-        else:
-            values = []
-
+        values = self.read_array('values')
         return Series(values, index=index, name=self.name)
 
     def write(self, obj, **kwargs):

pandas/io/tests/test_pytables.py

@@ -2358,6 +2358,11 @@ def test_empty_series_frame(self):
         self._check_roundtrip(df1, tm.assert_frame_equal)
         self._check_roundtrip(df2, tm.assert_frame_equal)
 
+    def test_empty_series(self):
+        for dtype in [np.int64, np.float64, np.object, 'm8[ns]', 'M8[ns]']:
+            s = Series(dtype=dtype)
+            self._check_roundtrip(s, tm.assert_series_equal)
+
     def test_can_serialize_dates(self):
 
         rng = [x.date() for x in bdate_range('1/1/2000', '1/30/2000')]