py3: add docx.compat module

Steve Canny · Steve Canny · commit c4602670f7da · 2014-01-07T02:48:18.000-08:00
* StringIO aliased to BytesIO
* remove ascii check in setup.py
* add Pillow dependency to tox.ini
diff --git a/docx/compat.py b/docx/compat.py
@@ -0,0 +1,27 @@
+# encoding: utf-8
+
+"""
+Provides Python 2/3 compatibility objects
+"""
+
+from __future__ import (
+    absolute_import, division, print_function, unicode_literals
+)
+
+import sys
+
+# ===========================================================================
+# Python 3 versions
+# ===========================================================================
+
+if sys.version_info >= (3, 0):
+
+    from io import BytesIO
+
+# ===========================================================================
+# Python 2 versions
+# ===========================================================================
+
+else:
+
+    from StringIO import StringIO as BytesIO  # noqa
diff --git a/docx/parts/image.py b/docx/parts/image.py
@@ -16,8 +16,7 @@
 except ImportError:
     import Image as PIL_Image
 
-from StringIO import StringIO
-
+from docx.compat import BytesIO
 from docx.opc.constants import CONTENT_TYPE as CT
 from docx.opc.package import Part
 from docx.shared import Emu, Inches, lazyproperty
@@ -72,7 +71,7 @@ def filename(self):
 
     @classmethod
     def from_blob(cls, blob):
-        stream = StringIO(blob)
+        stream = BytesIO(blob)
         return cls._from_stream(stream, blob)
 
     @classmethod
@@ -85,7 +84,7 @@ def from_file(cls, image_descriptor):
             path = image_descriptor
             with open(path, 'rb') as f:
                 blob = f.read()
-                stream = StringIO(blob)
+                stream = BytesIO(blob)
             filename = os.path.basename(path)
         else:
             stream = image_descriptor
diff --git a/setup.py b/setup.py
@@ -15,7 +15,6 @@ def text_of(relpath):
     file_path = os.path.join(thisdir, os.path.normpath(relpath))
     with open(file_path) as f:
         text = f.read()
-    text.decode('ascii')  # result discarded, just make sure no non-ascii chars
     return text
 
 # Read the version from docx.__version__ without importing the package
diff --git a/tox.ini b/tox.ini
@@ -23,6 +23,7 @@ deps =
     lxml
     mock
     pytest
+    Pillow
 
 commands =
     py.test -qx
