diff options
author | Matthieu Huin <mhuin@redhat.com> | 2021-06-15 12:11:20 +0200 |
---|---|---|
committer | Matthieu Huin <mhuin@redhat.com> | 2021-06-15 12:11:20 +0200 |
commit | c1a899ae21323c2f913c640f4688ae18de7aa40a (patch) | |
tree | 135a6c1b6609f0d67549ce6dcd19d92842cfc802 /python | |
parent | 1dafb884e47f5fc26232672b01c2a9574577e7be (diff) | |
download | subunit-git-c1a899ae21323c2f913c640f4688ae18de7aa40a.tar.gz |
Fix imports from testtools.compat
The future release of testtools will drop StringIO and BytesIO.
Try to import them from testtools.compat, or from the io module
if they're not available.
Diffstat (limited to 'python')
-rw-r--r-- | python/subunit/__init__.py | 6 | ||||
-rw-r--r-- | python/subunit/details.py | 6 | ||||
-rw-r--r-- | python/subunit/tests/test_chunked.py | 6 | ||||
-rw-r--r-- | python/subunit/tests/test_details.py | 6 | ||||
-rw-r--r-- | python/subunit/tests/test_subunit_filter.py | 6 | ||||
-rw-r--r-- | python/subunit/tests/test_subunit_stats.py | 6 | ||||
-rw-r--r-- | python/subunit/tests/test_test_protocol.py | 6 | ||||
-rw-r--r-- | python/subunit/tests/test_test_results.py | 5 |
8 files changed, 39 insertions, 8 deletions
diff --git a/python/subunit/__init__.py b/python/subunit/__init__.py index 17a970a..50b5f23 100644 --- a/python/subunit/__init__.py +++ b/python/subunit/__init__.py @@ -129,7 +129,11 @@ except ImportError: from extras import safe_hasattr from testtools import content, content_type, ExtendedToOriginalDecorator from testtools.content import TracebackContent -from testtools.compat import _b, _u, BytesIO, StringIO +from testtools.compat import _b, _u, +try: + from testtools.compat import BytesIO, StringIO +except ImportError: + from io import BytesIO, StringIO try: from testtools.testresult.real import _StringException RemoteException = _StringException diff --git a/python/subunit/details.py b/python/subunit/details.py index 9e5e005..5105580 100644 --- a/python/subunit/details.py +++ b/python/subunit/details.py @@ -17,7 +17,11 @@ """Handlers for outcome details.""" from testtools import content, content_type -from testtools.compat import _b, BytesIO +from testtools.compat import _b +try: + from testtools.compat import BytesIO, StringIO +except ImportError: + from io import BytesIO, StringIO from subunit import chunked diff --git a/python/subunit/tests/test_chunked.py b/python/subunit/tests/test_chunked.py index 5100b32..46cf150 100644 --- a/python/subunit/tests/test_chunked.py +++ b/python/subunit/tests/test_chunked.py @@ -17,7 +17,11 @@ import unittest -from testtools.compat import _b, BytesIO +from testtools.compat import _b +try: + from testtools.compat import BytesIO +except ImportError: + from io import BytesIO import subunit.chunked diff --git a/python/subunit/tests/test_details.py b/python/subunit/tests/test_details.py index 8605c5a..f3c70d2 100644 --- a/python/subunit/tests/test_details.py +++ b/python/subunit/tests/test_details.py @@ -16,7 +16,11 @@ import unittest -from testtools.compat import _b, StringIO +from testtools.compat import _b +try: + from testtools.compat import StringIO +except ImportError: + from io import StringIO import subunit.tests from subunit import content, content_type, details diff --git a/python/subunit/tests/test_subunit_filter.py b/python/subunit/tests/test_subunit_filter.py index 95aea36..baef3f6 100644 --- a/python/subunit/tests/test_subunit_filter.py +++ b/python/subunit/tests/test_subunit_filter.py @@ -24,7 +24,11 @@ from subunit import iso8601 import unittest from testtools import TestCase -from testtools.compat import _b, BytesIO +from testtools.compat import _b +try: + from testtools.compat import BytesIO +except ImportError: + from io import BytesIO from testtools.testresult.doubles import ExtendedTestResult, StreamResult import subunit diff --git a/python/subunit/tests/test_subunit_stats.py b/python/subunit/tests/test_subunit_stats.py index 7c5e42d..9faf24d 100644 --- a/python/subunit/tests/test_subunit_stats.py +++ b/python/subunit/tests/test_subunit_stats.py @@ -18,7 +18,11 @@ import unittest -from testtools.compat import _b, BytesIO, StringIO +from testtools.compat import _b +try: + from testtools.compat import BytesIO, StringIO +except ImportError: + from io import BytesIO, StringIO import subunit diff --git a/python/subunit/tests/test_test_protocol.py b/python/subunit/tests/test_test_protocol.py index 86aa4a6..faab93e 100644 --- a/python/subunit/tests/test_test_protocol.py +++ b/python/subunit/tests/test_test_protocol.py @@ -21,7 +21,11 @@ import tempfile import unittest from testtools import PlaceHolder, skipIf, TestCase, TestResult -from testtools.compat import _b, _u, BytesIO +from testtools.compat import _b, _u +try: + from testtools.compat import BytesIO, StringIO +except ImportError: + from io import BytesIO, StringIO from testtools.content import Content, TracebackContent, text_content from testtools.content_type import ContentType try: diff --git a/python/subunit/tests/test_test_results.py b/python/subunit/tests/test_test_results.py index 44f95b3..add30bb 100644 --- a/python/subunit/tests/test_test_results.py +++ b/python/subunit/tests/test_test_results.py @@ -20,7 +20,10 @@ import sys import unittest from testtools import TestCase -from testtools.compat import StringIO +try: + from testtools.compat import StringIO +except ImportError: + from io import StringIO from testtools.content import ( text_content, TracebackContent, |