diff --git a/test/helper.py b/test/helper.py index 9335a7d6b..d2fe5cc81 100644 --- a/test/helper.py +++ b/test/helper.py @@ -40,7 +40,7 @@ import shutil import subprocess from tempfile import mkdtemp, mkstemp from contextlib import contextmanager -from StringIO import StringIO +from six import StringIO from enum import Enum import beets diff --git a/test/test_importer.py b/test/test_importer.py index a1b0cd895..cd5756b1d 100644 --- a/test/test_importer.py +++ b/test/test_importer.py @@ -20,9 +20,9 @@ from __future__ import division, absolute_import, print_function import os import re import shutil -import StringIO import unicodedata import sys +from six import StringIO from tempfile import mkstemp from zipfile import ZipFile from tarfile import TarFile @@ -1250,14 +1250,14 @@ class ImportDuplicateSingletonTest(unittest.TestCase, TestHelper, class TagLogTest(_common.TestCase): def test_tag_log_line(self): - sio = StringIO.StringIO() + sio = StringIO() handler = logging.StreamHandler(sio) session = _common.import_session(loghandler=handler) session.tag_log('status', 'path') self.assertIn('status path', sio.getvalue()) def test_tag_log_unicode(self): - sio = StringIO.StringIO() + sio = StringIO() handler = logging.StreamHandler(sio) session = _common.import_session(loghandler=handler) session.tag_log('status', u'caf\xe9') # send unicode diff --git a/test/test_logging.py b/test/test_logging.py index 19d9b0e1e..2de8a3ceb 100644 --- a/test/test_logging.py +++ b/test/test_logging.py @@ -6,7 +6,7 @@ from __future__ import division, absolute_import, print_function import sys import threading import logging as log -from StringIO import StringIO +from six import StringIO import beets.logging as blog from beets import plugins, ui