io.BytesIO is also available in Python 2.7

This commit is contained in:
Claude Paroz
2019-10-03 21:07:49 +02:00
parent a0d19a56cb
commit 8aeb5e5158
6 changed files with 11 additions and 26 deletions
-2
View File
@@ -14,7 +14,6 @@ is_py3 = (sys.version_info[0] > 2)
if is_py3: if is_py3:
from io import BytesIO
from io import StringIO from io import StringIO
from statistics import median from statistics import median
from itertools import zip_longest as izip_longest from itertools import zip_longest as izip_longest
@@ -25,7 +24,6 @@ if is_py3:
xrange = range xrange = range
else: else:
from cStringIO import StringIO as BytesIO
from StringIO import StringIO from StringIO import StringIO
from tablib.packages.statistics import median from tablib.packages.statistics import median
from itertools import izip_longest from itertools import izip_longest
+1 -7
View File
@@ -1,14 +1,8 @@
""" Tablib - DataFrame Support. """ Tablib - DataFrame Support.
""" """
import sys import sys
from io import BytesIO
if sys.version_info[0] > 2:
from io import BytesIO
else:
from cStringIO import StringIO as BytesIO
try: try:
from pandas import DataFrame from pandas import DataFrame
+5 -9
View File
@@ -3,14 +3,10 @@
""" Tablib - HTML export support. """ Tablib - HTML export support.
""" """
import sys
if sys.version_info[0] > 2:
from io import BytesIO as StringIO
else:
from cStringIO import StringIO
import codecs import codecs
import sys
from io import BytesIO
from MarkupPy import markup from MarkupPy import markup
import tablib import tablib
from tablib.compat import unicode from tablib.compat import unicode
@@ -24,7 +20,7 @@ extensions = ('html', )
def export_set(dataset): def export_set(dataset):
"""HTML representation of a Dataset.""" """HTML representation of a Dataset."""
stream = StringIO() stream = BytesIO()
page = markup.page() page = markup.page()
page.table.open() page.table.open()
@@ -55,7 +51,7 @@ def export_set(dataset):
def export_book(databook): def export_book(databook):
"""HTML representation of a Databook.""" """HTML representation of a Databook."""
stream = StringIO() stream = BytesIO()
# Allow unicode characters in output # Allow unicode characters in output
wrapper = codecs.getwriter("utf8")(stream) wrapper = codecs.getwriter("utf8")(stream)
+2 -1
View File
@@ -3,8 +3,9 @@
""" Tablib - ODF Support. """ Tablib - ODF Support.
""" """
from io import BytesIO
from odf import opendocument, style, table, text from odf import opendocument, style, table, text
from tablib.compat import BytesIO, unicode from tablib.compat import unicode
title = 'ods' title = 'ods'
extensions = ('ods',) extensions = ('ods',)
+2 -1
View File
@@ -4,8 +4,9 @@
""" """
import sys import sys
from io import BytesIO
from tablib.compat import BytesIO, xrange from tablib.compat import xrange
import tablib import tablib
import xlrd import xlrd
import xlwt import xlwt
+1 -6
View File
@@ -4,12 +4,7 @@
""" """
import sys import sys
from io import BytesIO
if sys.version_info[0] > 2:
from io import BytesIO
else:
from cStringIO import StringIO as BytesIO
import openpyxl import openpyxl
import tablib import tablib