From 24f504f16bf4320c77d058687cc529a8419d3749 Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Tue, 26 Mar 2019 14:26:32 -0400 Subject: [PATCH] python3: remove more cStringIO --- src/calibre/devices/__init__.py | 4 ++-- src/calibre/ebooks/conversion/plugins/tcr_input.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/calibre/devices/__init__.py b/src/calibre/devices/__init__.py index 5ab3b38dee..83ad041ff6 100644 --- a/src/calibre/devices/__init__.py +++ b/src/calibre/devices/__init__.py @@ -8,7 +8,7 @@ Device drivers. import sys, time, pprint from functools import partial -from StringIO import StringIO +from io import BytesIO DAY_MAP = dict(Sun=0, Mon=1, Tue=2, Wed=3, Thu=4, Fri=5, Sat=6) MONTH_MAP = dict(Jan=1, Feb=2, Mar=3, Apr=4, May=5, Jun=6, Jul=7, Aug=8, Sep=9, Oct=10, Nov=11, Dec=12) @@ -77,7 +77,7 @@ def debug(ioreg_to_tmp=False, buf=None, plugins=None, oldo, olde = sys.stdout, sys.stderr if buf is None: - buf = StringIO() + buf = BytesIO() sys.stdout = sys.stderr = buf out = partial(prints, file=buf) diff --git a/src/calibre/ebooks/conversion/plugins/tcr_input.py b/src/calibre/ebooks/conversion/plugins/tcr_input.py index 45903e2c56..0578eb3aac 100644 --- a/src/calibre/ebooks/conversion/plugins/tcr_input.py +++ b/src/calibre/ebooks/conversion/plugins/tcr_input.py @@ -4,7 +4,7 @@ __license__ = 'GPL 3' __copyright__ = '2009, John Schember ' __docformat__ = 'restructuredtext en' -from cStringIO import StringIO +from io import BytesIO from calibre.customize.conversion import InputFormatPlugin @@ -24,7 +24,7 @@ class TCRInput(InputFormatPlugin): raw_txt = decompress(stream) log.info('Converting text to OEB...') - stream = StringIO(raw_txt) + stream = BytesIO(raw_txt) from calibre.customize.ui import plugin_for_input_format