diff options
author | Rémi Cardona <remi.cardona@free.fr> | 2014-07-18 23:00:22 +0200 |
---|---|---|
committer | Rémi Cardona <remi.cardona@free.fr> | 2014-07-18 23:00:22 +0200 |
commit | 3decce68245367a2eb5ce2bb3b98087f33ba5546 (patch) | |
tree | 7c4f9e54fd76a12988ade1d5644dce0ec0ccf567 | |
parent | 8c46a7616754fc26d3ff2f521b0612ca1a65b63e (diff) | |
download | logilab-common-3decce68245367a2eb5ce2bb3b98087f33ba5546.tar.gz |
[py3k] import StringIO from compat
-rw-r--r-- | debugger.py | 3 | ||||
-rw-r--r-- | test/unittest_changelog.py | 2 | ||||
-rw-r--r-- | test/unittest_configuration.py | 2 | ||||
-rw-r--r-- | test/unittest_shellutils.py | 3 | ||||
-rw-r--r-- | test/unittest_table.py | 2 | ||||
-rw-r--r-- | test/unittest_testlib.py | 2 | ||||
-rw-r--r-- | test/utils.py | 2 | ||||
-rw-r--r-- | ureports/__init__.py | 5 |
8 files changed, 10 insertions, 11 deletions
diff --git a/debugger.py b/debugger.py index ab0fb75..1f540a1 100644 --- a/debugger.py +++ b/debugger.py @@ -39,9 +39,10 @@ import os import os.path as osp import sys from pdb import Pdb -from cStringIO import StringIO import inspect +from logilab.common.compat import StringIO + try: from IPython import PyColorize except ImportError: diff --git a/test/unittest_changelog.py b/test/unittest_changelog.py index 8fd0646..6f60ead 100644 --- a/test/unittest_changelog.py +++ b/test/unittest_changelog.py @@ -17,8 +17,8 @@ # with logilab-common. If not, see <http://www.gnu.org/licenses/>. from os.path import join, dirname -from cStringIO import StringIO +from logilab.common.compat import StringIO from logilab.common.testlib import TestCase, unittest_main from logilab.common.changelog import ChangeLog diff --git a/test/unittest_configuration.py b/test/unittest_configuration.py index edcb5db..f8aceef 100644 --- a/test/unittest_configuration.py +++ b/test/unittest_configuration.py @@ -20,9 +20,9 @@ import os from os.path import join, dirname, abspath import re -from cStringIO import StringIO from sys import version_info +from logilab.common.compat import StringIO from logilab.common.testlib import TestCase, unittest_main from logilab.common.optik_ext import OptionValueError from logilab.common.configuration import Configuration, OptionError, \ diff --git a/test/unittest_shellutils.py b/test/unittest_shellutils.py index ca23f1b..16ee63e 100644 --- a/test/unittest_shellutils.py +++ b/test/unittest_shellutils.py @@ -20,7 +20,6 @@ import sys, os, tempfile, shutil from os.path import join, dirname, abspath import datetime, time -from StringIO import StringIO from six.moves import range @@ -29,7 +28,7 @@ from logilab.common.testlib import TestCase, unittest_main from logilab.common.shellutils import (globfind, find, ProgressBar, acquire_lock, release_lock, RawInput) -from logilab.common.compat import str_to_bytes +from logilab.common.compat import str_to_bytes, StringIO from logilab.common.proc import NoSuchProcess DATA_DIR = join(dirname(abspath(__file__)), 'data', 'find_test') diff --git a/test/unittest_table.py b/test/unittest_table.py index 362e8ce..320b693 100644 --- a/test/unittest_table.py +++ b/test/unittest_table.py @@ -22,10 +22,10 @@ Unittests for table management import sys import os -from cStringIO import StringIO from six.moves import range +from logilab.common.compat import StringIO from logilab.common.testlib import TestCase, unittest_main from logilab.common.table import Table, TableStyleSheet, DocbookTableWriter, \ DocbookRenderer, TableStyle, TableWriter, TableCellRenderer diff --git a/test/unittest_testlib.py b/test/unittest_testlib.py index e07ab21..f02a071 100644 --- a/test/unittest_testlib.py +++ b/test/unittest_testlib.py @@ -22,7 +22,6 @@ from __future__ import print_function import os import sys from os.path import join, dirname, isdir, isfile, abspath, exists -from cStringIO import StringIO import tempfile import shutil @@ -33,6 +32,7 @@ except NameError: from six.moves import range +from logilab.common.compat import StringIO from logilab.common.testlib import (unittest, TestSuite, unittest_main, Tags, TestCase, mock_object, create_files, InnerTest, with_tempdir, tag, require_version, require_module) diff --git a/test/utils.py b/test/utils.py index 37e23cc..da315e4 100644 --- a/test/utils.py +++ b/test/utils.py @@ -20,7 +20,7 @@ from __future__ import print_function -from cStringIO import StringIO +from logilab.common.compat import StringIO from logilab.common.ureports.nodes import * class WriterTC: diff --git a/ureports/__init__.py b/ureports/__init__.py index 8e1f306..65e9641 100644 --- a/ureports/__init__.py +++ b/ureports/__init__.py @@ -23,9 +23,8 @@ formatted as text and html. __docformat__ = "restructuredtext en" import sys -from cStringIO import StringIO -from StringIO import StringIO as UStringIO +from logilab.common.compat import StringIO from logilab.common.textutils import linesep @@ -157,7 +156,7 @@ class BaseWriter(object): self.writeln = writeln self.__compute_funcs.append((write, writeln)) for child in layout.children: - stream = UStringIO() + stream = StringIO() child.accept(self) yield stream.getvalue() self.__compute_funcs.pop() |