fixup! ENH: Support fspath protocol

Author: TomAugspurger

pandas/io/pytables.py

@@ -317,8 +317,9 @@ def read_hdf(path_or_buf, key=None, **kwargs):
         auto_close = False
     else:
         path_or_buf = _stringify_path(path_or_buf)
-
-    if isinstance(path_or_buf, (HDFStore, string_types)):
+        if not isinstance(path_or_buf, string_types):
+            raise NotImplementedError('Support for generic buffers has not been '
+                                      'implemented.')
         try:
             exists = os.path.exists(path_or_buf)
 
@@ -330,15 +331,10 @@ def read_hdf(path_or_buf, key=None, **kwargs):
             raise compat.FileNotFoundError(
                 'File %s does not exist' % path_or_buf)
 
-        if isinstance(path_or_buf, string_types):
-            store = HDFStore(path_or_buf, **kwargs)
-            # can't auto open/close if we are using an iterator
-            # so delegate to the iterator
-            auto_close = True
-
-    else:
-        raise NotImplementedError('Support for generic buffers has not been '
-                                  'implemented.')
+        store = HDFStore(path_or_buf, **kwargs)
+        # can't auto open/close if we are using an iterator
+        # so delegate to the iterator
+        auto_close = True
 
     try:
         if key is None:

pandas/tests/io/test_pytables.py

@@ -16,7 +16,7 @@
                     date_range, timedelta_range, Index, DatetimeIndex,
                     isnull)
 
-from pandas.compat import is_platform_windows, PY3, PY35
+from pandas.compat import is_platform_windows, PY3, PY35, BytesIO
 from pandas.io.formats.printing import pprint_thing
 
 tables = pytest.importorskip('tables')
@@ -5007,8 +5007,9 @@ def test_read_hdf_errors(self):
             store = HDFStore(path, mode='r')
             store.close()
             pytest.raises(IOError, read_hdf, store, 'df')
-            with open(path, mode='r') as store:
-                pytest.raises(NotImplementedError, read_hdf, store, 'df')
+
+    def test_read_hdf_generic_buffer_errors(self):
+        pytest.raises(NotImplementedError, read_hdf, BytesIO(b''), 'df')
 
     def test_invalid_complib(self):
         df = DataFrame(np.random.rand(4, 5),