fix #19, use cStringIO by default but allow StringIO if the developer…

… isn't aware of cStringIO
pyexcel · Jun 2, 2016 · ce7a62f · ce7a62f
1 parent 6411955
commit ce7a62f
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 6 deletions.
diff --git a/pyexcel_io/_compact.py b/pyexcel_io/_compact.py
@@ -24,16 +24,20 @@ def is_generator(struct):
 
 
 if PY2:
-    from StringIO import StringIO
-    from StringIO import StringIO as BytesIO
+    from cStringIO import StringIO
+    from cStringIO import StringIO as BytesIO
+    from StringIO import StringIO as SlowStringIO
     text_type = unicode
 
     class Iterator(object):
         def next(self):
             return type(self).__next__(self)
 
     def isstream(instance):
-        return isinstance(instance, StringIO)
+        import cStringIO
+        return (isinstance(instance, cStringIO.InputType) or
+                isinstance(instance, cStringIO.OutputType) or
+                isinstance(instance, SlowStringIO))
 
 else:
     from io import StringIO, BytesIO

diff --git a/pyexcel_io/manager.py b/pyexcel_io/manager.py
@@ -7,7 +7,7 @@
     :copyright: (c) 2014-2016 by Onni Software Ltd.
     :license: New BSD License, see LICENSE for more details
 """
-from ._compact import StringIO, BytesIO
+from ._compact import StringIO, BytesIO, PY2
 from .utils import resolve_missing_readers, resolve_missing_writers
 
 
@@ -114,6 +114,9 @@ def get_io(file_type):
 
     @staticmethod
     def validate_io(file_type, stream):
+        if PY2:
+            # only python 3 cares about stringio types
+            return True
         if file_type in RWManager.text_stream_types:
             return isinstance(stream, StringIO)
         elif file_type in RWManager.binary_stream_types:

diff --git a/tests/test_io.py b/tests/test_io.py
@@ -165,8 +165,12 @@ def test_is_string():
         assert is_string(type('a')) == True
 
 def test_validate_io():
-    assert RWManager.validate_io("csd", StringIO()) == False
-
+    if PY2:
+        # because this function in python 2 is hardcode
+        # why? because validation is not needed in python 3
+        assert RWManager.validate_io("csd", StringIO()) == True
+    else:
+        assert RWManager.validate_io("csd", StringIO()) == False
 
 @raises(TypeError)
 def test_generator_is_obtained():