Merge pull request #36 from fuhrysteve/simplify_get_data

lower the complexity of pyexcel_io.io.get_data a bit
pyexcel · May 16, 2017 · e77fe85 · e77fe85
2 parents 0d1d1ab + 6918d09
commit e77fe85
Showing 1 changed file with 5 additions and 6 deletions.
diff --git a/pyexcel_io/io.py b/pyexcel_io/io.py
@@ -31,17 +31,16 @@ def get_data(afile, file_type=None, streaming=False, **keywords):
     :param keywords: any other library specific parameters
     :returns: an ordered dictionary
     """
-    if isstream(afile) and file_type is None:
-        file_type = constants.FILE_FORMAT_CSV
     if isstream(afile):
         data = load_data(file_stream=afile,
-                         file_type=file_type, **keywords)
+                         file_type=file_type or constants.FILE_FORMAT_CSV,
+                         **keywords)
     else:
-        if afile is not None and file_type is not None:
-            data = load_data(file_content=afile,
+        if afile is None or file_type is None:
+            data = load_data(file_name=afile,
                              file_type=file_type, **keywords)
         else:
-            data = load_data(file_name=afile,
+            data = load_data(file_content=afile,
                              file_type=file_type, **keywords)
     if streaming is False:
         for key in data.keys():