Merge pull request #57 from nathanielatom/master

Allow TdmsFile to accept any file-like object

nptdms/tdms.py

@@ -18,7 +18,6 @@
 import numpy as np
 from datetime import datetime, timedelta
 import tempfile
-from io import BytesIO
 try:
     import pytz
 except ImportError:
@@ -93,14 +92,17 @@
 
 
 def fromfile(file, dtype, count, *args, **kwargs):
-    """ Wrapper around np.fromfile to support BytesIO fake files."""
+    """Wrapper around np.fromfile to support any file-like object"""
 
-    if isinstance(file, BytesIO):
-        return np.fromstring(
+    if isinstance(file, int) or (
+            hasattr(file, 'fileno') and callable(file.fileno)):
+        # satisfy criteria that 'argument must be an int, or
+        # have a fileno() method' - from numpy TypeError
+        return np.fromfile(file, dtype=dtype, count=count, *args, **kwargs)
+    else:
+        return np.frombuffer(
             file.read(count * np.dtype(dtype).itemsize),
             dtype=dtype, count=count, *args, **kwargs)
-    else:
-        return np.fromfile(file, dtype=dtype, count=count, *args, **kwargs)
 
 
 def read_string(file):